diff options
| author | marino <marino@FreeBSD.org> | 2014-02-03 21:37:19 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2014-02-03 21:37:19 +0800 |
| commit | 4a2be29d0b5d5f48c19c98f939504abdc9c3b495 (patch) | |
| tree | e9580dbda4e6778b59a95291a8943dd82ec56917 /lang | |
| parent | 2ebc29e7307315616c80e78c2d5caa8980068653 (diff) | |
| download | freebsd-ports-gnome-4a2be29d0b5d5f48c19c98f939504abdc9c3b495.tar.gz freebsd-ports-gnome-4a2be29d0b5d5f48c19c98f939504abdc9c3b495.tar.zst freebsd-ports-gnome-4a2be29d0b5d5f48c19c98f939504abdc9c3b495.zip | |
lang/gnatdroid-armv(5,7): Fix build on FreeBSD 10+
Reported by pkg-fallout
Cause: Bad gcc makefile, doesn't properly support cross-compiler build
Workaround: duplicate *-cross executables to the base names so that the
install target doesn't try to rebuild them
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gnatdroid-armv5/Makefile | 11 | ||||
| -rw-r--r-- | lang/gnatdroid-armv5/pkg-plist | 22 | ||||
| -rw-r--r-- | lang/gnatdroid-armv7/Makefile | 11 | ||||
| -rw-r--r-- | lang/gnatdroid-armv7/pkg-plist | 22 |
4 files changed, 40 insertions, 26 deletions
diff --git a/lang/gnatdroid-armv5/Makefile b/lang/gnatdroid-armv5/Makefile index acf5f05d6fd4..ea38465d2d22 100644 --- a/lang/gnatdroid-armv5/Makefile +++ b/lang/gnatdroid-armv5/Makefile @@ -59,6 +59,8 @@ PLIST_SUB+= TARGET="${DROID_TARGET}" PLIST_SUB+= GCCVERS="${GCC_VERSION}" SUB_FILES= pkg-message SUB_LIST= TARGET="${DROID_TARGET}" +CROSS= gnat gnatbind gnatchop gnatclean gnatfind gnatkr \ + gnatlink gnatls gnatmake gnatprep gnatxref ALL_TARGET= all @@ -144,8 +146,13 @@ do-configure: ${CFG_SCRIPT} ${CONFIGURE_ARGS} pre-install: - # The "native tools" won't install unless a directory exists - ${MKDIR} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin +# The "native tools" won't install unless a directory exists + ${MKDIR} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin +# Buggy makefile; seems to have forgotten this is a cross compiler +# Manually rename products so it doesn't rebuild them with new name +.for X in ${CROSS} + ${CP} -a ${BUILD_WRKSRC}/gcc/${X}-cross ${BUILD_WRKSRC}/gcc/${X} +.endfor do-install: cd ${BUILD_WRKSRC} && ${GMAKE} install-strip DESTDIR=${STAGEDIR} diff --git a/lang/gnatdroid-armv5/pkg-plist b/lang/gnatdroid-armv5/pkg-plist index b2d5b0509677..4179a1122b7a 100644 --- a/lang/gnatdroid-armv5/pkg-plist +++ b/lang/gnatdroid-armv5/pkg-plist @@ -1,6 +1,13 @@ +bin/%%TARGET%%-cpp +bin/%%TARGET%%-gcc-%%GCCVERS%% +bin/%%TARGET%%-gcov +bin/%%TARGET%%-gnat bin/%%TARGET%%-gnatbind bin/%%TARGET%%-gnatchop -bin/%%TARGET%%-gnat +bin/%%TARGET%%-gnatclean +bin/%%TARGET%%-gnatfind +bin/%%TARGET%%-gnatgcc +%%FORT%%bin/%%TARGET%%-gnatgfortran bin/%%TARGET%%-gnatkr bin/%%TARGET%%-gnatlink bin/%%TARGET%%-gnatls @@ -8,20 +15,13 @@ bin/%%TARGET%%-gnatmake bin/%%TARGET%%-gnatname bin/%%TARGET%%-gnatprep bin/%%TARGET%%-gnatxref -bin/%%TARGET%%-gnatfind -bin/%%TARGET%%-gnatclean -bin/%%TARGET%%-gcov -bin/%%TARGET%%-cpp -bin/%%TARGET%%-gnatgcc -bin/%%TARGET%%-gcc-%%GCCVERS%% -%%FORT%%bin/%%TARGET%%-gnatgfortran +%%TARGET%%/bin/gnat %%TARGET%%/bin/gnatbind %%TARGET%%/bin/gnatchop -%%TARGET%%/bin/gnat +%%TARGET%%/bin/gnatgcc +%%FORT%%%%TARGET%%/bin/gnatgfortran %%TARGET%%/bin/gnatkr %%TARGET%%/bin/gnatlink %%TARGET%%/bin/gnatls %%TARGET%%/bin/gnatmake %%TARGET%%/bin/gnatprep -%%TARGET%%/bin/gnatgcc -%%FORT%%%%TARGET%%/bin/gnatgfortran diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile index 435952e0e27c..0322024c8701 100644 --- a/lang/gnatdroid-armv7/Makefile +++ b/lang/gnatdroid-armv7/Makefile @@ -59,6 +59,8 @@ PLIST_SUB+= TARGET="${DROID_TARGET}" PLIST_SUB+= GCCVERS="${GCC_VERSION}" SUB_FILES= pkg-message SUB_LIST= TARGET="${DROID_TARGET}" +CROSS= gnat gnatbind gnatchop gnatclean gnatfind gnatkr \ + gnatlink gnatls gnatmake gnatprep gnatxref ALL_TARGET= all @@ -144,8 +146,13 @@ do-configure: ${CFG_SCRIPT} ${CONFIGURE_ARGS} pre-install: - # The "native tools" won't install unless a directory exists - ${MKDIR} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin +# The "native tools" won't install unless a directory exists + ${MKDIR} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin +# Buggy makefile; seems to have forgotten this is a cross compiler +# Manually rename products so it doesn't rebuild them with new name +.for X in ${CROSS} + ${CP} -a ${BUILD_WRKSRC}/gcc/${X}-cross ${BUILD_WRKSRC}/gcc/${X} +.endfor do-install: cd ${BUILD_WRKSRC} && ${GMAKE} install-strip DESTDIR=${STAGEDIR} diff --git a/lang/gnatdroid-armv7/pkg-plist b/lang/gnatdroid-armv7/pkg-plist index b2d5b0509677..4179a1122b7a 100644 --- a/lang/gnatdroid-armv7/pkg-plist +++ b/lang/gnatdroid-armv7/pkg-plist @@ -1,6 +1,13 @@ +bin/%%TARGET%%-cpp +bin/%%TARGET%%-gcc-%%GCCVERS%% +bin/%%TARGET%%-gcov +bin/%%TARGET%%-gnat bin/%%TARGET%%-gnatbind bin/%%TARGET%%-gnatchop -bin/%%TARGET%%-gnat +bin/%%TARGET%%-gnatclean +bin/%%TARGET%%-gnatfind +bin/%%TARGET%%-gnatgcc +%%FORT%%bin/%%TARGET%%-gnatgfortran bin/%%TARGET%%-gnatkr bin/%%TARGET%%-gnatlink bin/%%TARGET%%-gnatls @@ -8,20 +15,13 @@ bin/%%TARGET%%-gnatmake bin/%%TARGET%%-gnatname bin/%%TARGET%%-gnatprep bin/%%TARGET%%-gnatxref -bin/%%TARGET%%-gnatfind -bin/%%TARGET%%-gnatclean -bin/%%TARGET%%-gcov -bin/%%TARGET%%-cpp -bin/%%TARGET%%-gnatgcc -bin/%%TARGET%%-gcc-%%GCCVERS%% -%%FORT%%bin/%%TARGET%%-gnatgfortran +%%TARGET%%/bin/gnat %%TARGET%%/bin/gnatbind %%TARGET%%/bin/gnatchop -%%TARGET%%/bin/gnat +%%TARGET%%/bin/gnatgcc +%%FORT%%%%TARGET%%/bin/gnatgfortran %%TARGET%%/bin/gnatkr %%TARGET%%/bin/gnatlink %%TARGET%%/bin/gnatls %%TARGET%%/bin/gnatmake %%TARGET%%/bin/gnatprep -%%TARGET%%/bin/gnatgcc -%%FORT%%%%TARGET%%/bin/gnatgfortran |