diff options
| author | marino <marino@FreeBSD.org> | 2014-03-12 18:20:29 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2014-03-12 18:20:29 +0800 |
| commit | 0655784ce0d6917610eaf44f9dd49c098f57eaee (patch) | |
| tree | caf46a438b9915a25c4068633d7712817fe2a2d4 /devel/gps | |
| parent | 2d69d6ef9af433957c97fd1a3ea730a13440fb61 (diff) | |
| download | freebsd-ports-gnome-0655784ce0d6917610eaf44f9dd49c098f57eaee.tar.gz freebsd-ports-gnome-0655784ce0d6917610eaf44f9dd49c098f57eaee.tar.zst freebsd-ports-gnome-0655784ce0d6917610eaf44f9dd49c098f57eaee.zip | |
devel/gps: Fix build on upcoming gcc49
This port has to be bumped for two reasons:
1) It should have been built in production mode across the board.
There are some style check failures that appear in "debug" mode
due to gcc49 checks being more strict that gcc47 checks. Those
issues aren't fixed, but simply hidden by switching to production
which was desired anyway.
2) The project logic was looking for "gnatgcc", a leftover from the
gnat-aux days. The gcc-aux compilers call their drivers "gcc" as
expected by gps. This removes the patch for gnatgcc since the
original code is correct.
Diffstat (limited to 'devel/gps')
| -rw-r--r-- | devel/gps/Makefile | 7 | ||||
| -rw-r--r-- | devel/gps/files/patch-gnatlib-gnat_src-mlib-utl.adb | 11 |
2 files changed, 4 insertions, 14 deletions
diff --git a/devel/gps/Makefile b/devel/gps/Makefile index 5781a819079c..1f7d98412263 100644 --- a/devel/gps/Makefile +++ b/devel/gps/Makefile @@ -3,7 +3,7 @@ PORTNAME= gps PORTVERSION= 5.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= gps-5.2.1-1-src @@ -31,6 +31,7 @@ WRKSRC= ${WRKDIR}/gps-release-ide-${PORTVERSION}-src CONFIGURE_ENV+= AWK=/usr/bin/awk MAKE_ENV+= PROCESSORS=${MAKE_JOBS_NUMBER} +MAKE_ARGS+= Build=Production OPTIONS_DEFINE= SYSLOG SQLITE PGSQL PYTHON READLINE OPTIONS_DEFAULT= SYSLOG SQLITE PYTHON READLINE @@ -103,7 +104,7 @@ post-patch: ${WRKSRC}/gnatlib/src/gnatcoll_readline.gpr.in do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} default + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} default pre-install: .if ${PORT_OPTIONS:MPYTHON} @@ -116,7 +117,7 @@ post-install: ${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/tutorial/_sources @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty -print | ${XARGS} ${RMDIR} @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ - ${SORT} > ${TMPPLIST} + ${SORT} >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \ ${SED} -e '/share\/doc$$/d' -e '/share\/gps$$/d' \ -e '/share\/gps\/plug-ins$$/d' -e '/share\/examples$$/d' \ diff --git a/devel/gps/files/patch-gnatlib-gnat_src-mlib-utl.adb b/devel/gps/files/patch-gnatlib-gnat_src-mlib-utl.adb deleted file mode 100644 index 287b4d249012..000000000000 --- a/devel/gps/files/patch-gnatlib-gnat_src-mlib-utl.adb +++ /dev/null @@ -1,11 +0,0 @@ ---- gnatlib/gnat_src/mlib-utl.adb.orig 2010-02-14 02:40:00.000000000 +0100 -+++ gnatlib/gnat_src/mlib-utl.adb 2011-10-09 04:11:21.000000000 +0200 -@@ -412,7 +412,7 @@ - if Driver_Name = No_Name then - if Gcc_Exec = null then - if Gcc_Name = null then -- Gcc_Name := Osint.Program_Name ("gcc", "gnatmake"); -+ Gcc_Name := Osint.Program_Name ("gnatgcc", "gnatmake"); - end if; - - Gcc_Exec := Locate_Exec_On_Path (Gcc_Name.all); |