mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

devel/gnatcoll4: Rename gnatinspect and toggle off iconv option default

Browse Source 
The GNAT Programming Studio wants to use gnatinspect, so it needs to
build it.  At the same time, gnatinspect also belongs to gnatcoll.
Resolve a filename conflict by renaming it to gnatinspect-xref when
it's build by gnatcoll.

Also turn off iconv support by default.  It causes GPS to crash
almost immediately and the issue is likely within the gnatcoll code.
Until this is investigated and hopefully fixed, keep it off by default.

Also, devel/gnatcoll will not be a dependency of GPS for two reasons:
GPS is so fluid that it really needs the embedded version to guarantee
that it can be built, and secondly devel/gnatcoll and devel/gps could
easily need different build options.  So that leaves devel/gnatcoll as
purely a standalone development library.
This commit is contained in:
John Marino 2014-05-24 21:31:01 +00:00
parent cf98565f88
commit a9ee86fad5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=355092
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devel/gnatcoll/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gnatcoll
PORTVERSION= 2014
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://downloads.dragonlace.net/src/
DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src
@ -24,7 +24,7 @@ PORTEXAMPLES= *
OPTIONS_DEFINE= READLINE SYSLOG SQLITE PYTHON GTK PGSQL ICONV \
DOCS EXAMPLES
OPTIONS_DEFAULT= READLINE SYSLOG SQLITE PYTHON GTK PGSQL ICONV
OPTIONS_DEFAULT= READLINE SYSLOG SQLITE PYTHON GTK PGSQL
OPTIONS_SUB= yes
DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx
GTK_LIB_DEPENDS= libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3
@ -62,6 +62,8 @@ CONFIGURE_ARGS+= --with-postgresql=${PREFIX}
CONFIGURE_ARGS+= --without-postgresql
.endif
# There might be something wrong with iconv support as seen in GPS crash.
# That's why this option is not enabled by default
.if ${PORT_OPTIONS:MICONV}
USES+= iconv
CONFIGURE_ARGS+= --with-iconv=${ICONV_PREFIX}
@ -104,5 +106,9 @@ post-install:
.if ! ${PORT_OPTIONS:MEXAMPLES}
${RM} -rf ${STAGEDIR}${EXAMPLESDIR}
.endif
.if ${PORT_OPTIONS:MSQLITE}
# Rename gnatinspect to gnatinspect-xref to avoid GPS conflict
cd ${STAGEDIR}${PREFIX}/bin && ${MV} gnatinspect gnatinspect-xref
.endif
.include <bsd.port.mk>

2
devel/gnatcoll/pkg-plist
View File

@ -1,5 +1,5 @@
bin/gnatcoll_db2ada
bin/gnatinspect
%%SQLITE%%bin/gnatinspect-xref
%%PYTHON%%include/gnatcoll/gnatcoll-any_types-python.adb
%%PYTHON%%include/gnatcoll/gnatcoll-any_types-python.ads
include/gnatcoll/gnatcoll-any_types.adb