Date: Sun, 13 Mar 2016 21:04:43 +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: r411030 - in head/lang/gcc6-aux: . files Message-ID: <201603132104.u2DL4hIF060678@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Mar 13 21:04:43 2016 New Revision: 411030 URL: https://svnweb.freebsd.org/changeset/ports/411030 Log: lang/gcc6-aux: install gnatdroid/dejagnu support Change names of gnatdroid-support dejagnu exp files so that gcc6-aux can co-exist with gcc-aux. The gnatdroid compilers will be rebased on gcc6-aux in the future. Technically the resulting package changes and thus requires a bump, but nothing uses these two new files yet, so I'm not bumping it. Added: head/lang/gcc6-aux/files/android6.exp - copied, changed from r411028, head/lang/gcc6-aux/files/android.exp head/lang/gcc6-aux/files/gnatdroid6.exp - copied, changed from r411028, head/lang/gcc6-aux/files/gnatdroid.exp Deleted: head/lang/gcc6-aux/files/android.exp head/lang/gcc6-aux/files/gnatdroid.exp Modified: head/lang/gcc6-aux/Makefile Modified: head/lang/gcc6-aux/Makefile ============================================================================== --- head/lang/gcc6-aux/Makefile Sun Mar 13 20:44:00 2016 (r411029) +++ head/lang/gcc6-aux/Makefile Sun Mar 13 21:04:43 2016 (r411030) @@ -254,20 +254,17 @@ do-install: cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \ ${MAKE_CMD} install-strip ${MAKE_ARGS} ${MV} ${STAGEDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share -# Don't activate until this port builds gnatdroid -# Otherwise it will conflict with lang/gcc-aux -# Add "share" after {PORTNAME} on 3rd line of post-stage target -# ${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \ -# ${STAGEDIR}${PREFIX}/share/dejagnu/config -# ${INSTALL_DATA} ${FILESDIR}/android.exp \ -# ${STAGEDIR}${PREFIX}/share/dejagnu/config -# ${INSTALL_DATA} ${FILESDIR}/gnatdroid.exp \ -# ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards + ${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \ + ${STAGEDIR}${PREFIX}/share/dejagnu/config + ${INSTALL_DATA} ${FILESDIR}/android6.exp \ + ${STAGEDIR}${PREFIX}/share/dejagnu/config + ${INSTALL_DATA} ${FILESDIR}/gnatdroid6.exp \ + ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards post-stage: (cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \ ${SORT} -dr | ${XARGS} ${RMDIR}) - (cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} \ + (cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} share \ \( -type f -or -type l \) | ${SORT} | ${SED} \ -e 's/\/man\/man[1578]\/.*[1578]$$/&.gz/' >> ${TMPPLIST}) .if ${PORT_OPTIONS:MBOOTSTRAP} Copied and modified: head/lang/gcc6-aux/files/android6.exp (from r411028, head/lang/gcc6-aux/files/android.exp) ============================================================================== --- head/lang/gcc6-aux/files/android.exp Sun Mar 13 20:08:47 2016 (r411028, copy source) +++ head/lang/gcc6-aux/files/android6.exp Sun Mar 13 21:04:43 2016 (r411030) @@ -1,7 +1,7 @@ # This file is part of DejaGnu. if {![info exists board]} { - error "must set $board before loading android.exp" + error "must set $board before loading android6.exp" } # For rcp_download, rsh_exec. Copied and modified: head/lang/gcc6-aux/files/gnatdroid6.exp (from r411028, head/lang/gcc6-aux/files/gnatdroid.exp) ============================================================================== --- head/lang/gcc6-aux/files/gnatdroid.exp Sun Mar 13 20:08:47 2016 (r411028, copy source) +++ head/lang/gcc6-aux/files/gnatdroid6.exp Sun Mar 13 21:04:43 2016 (r411030) @@ -1,6 +1,6 @@ # gnatdroid testsuite running over ssh. -load_generic_config "android" +load_generic_config "android6" process_multilib_options ""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603132104.u2DL4hIF060678>