Date: Mon, 3 Feb 2014 13:37:20 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342434 - in head/lang: gnatdroid-armv5 gnatdroid-armv7 Message-ID: <201402031337.s13DbKjh094008@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Feb 3 13:37:19 2014 New Revision: 342434 URL: http://svnweb.freebsd.org/changeset/ports/342434 QAT: https://qat.redports.org/buildarchive/r342434/ Log: 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 Modified: head/lang/gnatdroid-armv5/Makefile head/lang/gnatdroid-armv5/pkg-plist head/lang/gnatdroid-armv7/Makefile head/lang/gnatdroid-armv7/pkg-plist Modified: head/lang/gnatdroid-armv5/Makefile ============================================================================== --- head/lang/gnatdroid-armv5/Makefile Mon Feb 3 12:32:17 2014 (r342433) +++ head/lang/gnatdroid-armv5/Makefile Mon Feb 3 13:37:19 2014 (r342434) @@ -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} Modified: head/lang/gnatdroid-armv5/pkg-plist ============================================================================== --- head/lang/gnatdroid-armv5/pkg-plist Mon Feb 3 12:32:17 2014 (r342433) +++ head/lang/gnatdroid-armv5/pkg-plist Mon Feb 3 13:37:19 2014 (r342434) @@ -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 Modified: head/lang/gnatdroid-armv7/Makefile ============================================================================== --- head/lang/gnatdroid-armv7/Makefile Mon Feb 3 12:32:17 2014 (r342433) +++ head/lang/gnatdroid-armv7/Makefile Mon Feb 3 13:37:19 2014 (r342434) @@ -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} Modified: head/lang/gnatdroid-armv7/pkg-plist ============================================================================== --- head/lang/gnatdroid-armv7/pkg-plist Mon Feb 3 12:32:17 2014 (r342433) +++ head/lang/gnatdroid-armv7/pkg-plist Mon Feb 3 13:37:19 2014 (r342434) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402031337.s13DbKjh094008>