diff options
| author | marino <marino@FreeBSD.org> | 2015-03-16 23:11:40 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2015-03-16 23:11:40 +0800 |
| commit | 72516ec1b3fdb7b355240eaaf5df3120344c0a1c (patch) | |
| tree | 95ebe1309939f38eabd4f0469b5c79d936ac4932 /lang | |
| parent | 819cdf4d23c2e2f18a203870167117a85395656d (diff) | |
| download | freebsd-ports-gnome-72516ec1b3fdb7b355240eaaf5df3120344c0a1c.tar.gz freebsd-ports-gnome-72516ec1b3fdb7b355240eaaf5df3120344c0a1c.tar.zst freebsd-ports-gnome-72516ec1b3fdb7b355240eaaf5df3120344c0a1c.zip | |
lang/gnat_util, devel/gprbuild: Support gcc5-aux
GPRBuild is too highly tethered to the compiler -- in practical terms
each version of GPRBuild is meant to be built by a specific GPL GNAT,
but we're trying to build it with multiple FSF GNATS that are out of sync.
This patch set does allow GPRBuild to build and apparently work with both
gcc-aux and gcc5-aux. There is no real change for gcc-aux (OpenVMS is
removed from the code but it should be same difference) ang for gcc5-aux,
the previous patches aren't needed but new ones are. Thus, EXTRA_PATCHES
had to be set for each of the two supported compilers.
lang/gnat_utils had to be modified to stop packaging OpenVMS target files
as apparently this target has been removed from gcc5-aux.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc-aux/Makefile.version | 2 | ||||
| -rw-r--r-- | lang/gnat_util/Makefile | 8 | ||||
| -rw-r--r-- | lang/gnat_util/Makefile.sources | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lang/gcc-aux/Makefile.version b/lang/gcc-aux/Makefile.version index 3708bbeadff5..de3ce8ba20cd 100644 --- a/lang/gcc-aux/Makefile.version +++ b/lang/gcc-aux/Makefile.version @@ -5,7 +5,7 @@ GCC_POINT= 2 GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT} SNAPSHOT= 20141023 MAIN_PR= 1 -UTIL_PR= 0 +UTIL_PR= 1 ARMV5_PR= 0 ARMV7_PR= 0 diff --git a/lang/gnat_util/Makefile b/lang/gnat_util/Makefile index a5ecd5451b6b..430cf09396bc 100644 --- a/lang/gnat_util/Makefile +++ b/lang/gnat_util/Makefile @@ -17,12 +17,14 @@ LICENSE_COMB= multi USES= ada tar:bzip2 NO_MTREE= yes -DISTINFO_FILE= ${.CURDIR}/../gcc-aux/distinfo +DISTINFO_FILE= ${.CURDIR}/../${ADAXX}-aux/distinfo WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ENV= MAKEOBJDIR=${WRKSRC}/obj .include "${.CURDIR}/Makefile.sources" -.include "${.CURDIR}/../gcc-aux/Makefile.version" + +.include <bsd.port.pre.mk> +.include "${.CURDIR}/../${ADAXX}-aux/Makefile.version" post-extract: @${MKDIR} ${WRKSRC}/obj @@ -41,4 +43,4 @@ post-install: @(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ ${SORT} >> ${TMPPLIST}) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/lang/gnat_util/Makefile.sources b/lang/gnat_util/Makefile.sources index d64b2ba77b17..f7bc2cb14294 100644 --- a/lang/gnat_util/Makefile.sources +++ b/lang/gnat_util/Makefile.sources @@ -53,8 +53,6 @@ GNAT_SRCS= \ mlib-fil.ads \ mlib-tgt-specific.adb \ mlib-tgt-specific.ads \ - mlib-tgt-vms_common.adb \ - mlib-tgt-vms_common.ads \ mlib-tgt.adb \ mlib-tgt.ads \ mlib-utl.adb \ |