Date: Wed, 25 Feb 2015 00:30:56 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379858 - in head/lang/dmd2: . files Message-ID: <201502250030.t1P0UuMu035958@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Wed Feb 25 00:30:55 2015 New Revision: 379858 URL: https://svnweb.freebsd.org/changeset/ports/379858 QAT: https://qat.redports.org/buildarchive/r379858/ Log: By default dmd uses gcc to invoke the linker. Fix linking on FreeBSD systems that use clang as the system compiler (FreeBSD 10+). Added: head/lang/dmd2/files/patch-freebsd__bin32__dmd.conf (contents, props changed) head/lang/dmd2/files/patch-freebsd__bin64__dmd.conf (contents, props changed) head/lang/dmd2/files/patch-src__dmd__link.c (contents, props changed) Deleted: head/lang/dmd2/files/patch-linux-bin32-dmd.conf Modified: head/lang/dmd2/Makefile head/lang/dmd2/pkg-plist Modified: head/lang/dmd2/Makefile ============================================================================== --- head/lang/dmd2/Makefile Wed Feb 25 00:22:39 2015 (r379857) +++ head/lang/dmd2/Makefile Wed Feb 25 00:30:55 2015 (r379858) @@ -4,6 +4,7 @@ PORTNAME= dmd PKGNAMESUFFIX= 2 PORTVERSION= 2.066.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://ftp.digitalmars.com/ DISTNAME= dmd.${PORTVERSION} @@ -40,8 +41,10 @@ BROKEN= Does not install on sparc64: di .if ${ARCH} == "amd64" MAKE_ARGS+= MODEL=64 +MODEL= 64 .else MAKE_ARGS+= MODEL=32 +MODEL= 32 .endif .if defined(WITH_DEBUG) @@ -63,22 +66,18 @@ post-patch: @${REINPLACE_CMD} -e "s|%@P%/../../src/phobos|${MODULEDIR}|" \ -e "s|%@P%/../lib|${PREFIX}/lib|" \ -e "s|%@P%/../../src/druntime|${PREFIX}/include/d/druntime|" \ - ${WRKDIR}/dmd2/linux/bin32/dmd.conf - @${ECHO_CMD} >> ${WRKDIR}/dmd2/linux/bin32/dmd.conf - @${SED} -e "s|Environment32|Environment64|" ${WRKDIR}/dmd2/linux/bin32/dmd.conf >>${WRKDIR}/dmd2/linux/bin32/dmd.conf + ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf + @${ECHO_CMD} >> ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf do-install: ${INSTALL_MAN} ${WRKDIR}/dmd2/man/man1/dmd.1 ${STAGEDIR}${MANPREFIX}/man/man1/dmd.1 ${INSTALL_MAN} ${WRKDIR}/dmd2/man/man5/dmd.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5/dmd.conf.5 - ${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${STAGEDIR}${PREFIX}/etc/dmd.conf.sample + ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf ${STAGEDIR}${PREFIX}/etc/dmd.conf.sample ${INSTALL_PROGRAM} ${WRKSRC}/dmd ${STAGEDIR}${PREFIX}/bin/dmd -.if ${ARCH} == "amd64" - ${INSTALL_DATA} ${WRKSRC}/../../freebsd/lib64/libphobos2.a ${STAGEDIR}${PREFIX}/lib -.else - ${INSTALL_DATA} ${WRKSRC}/../../freebsd/lib32/libphobos2.a ${STAGEDIR}${PREFIX}/lib -.endif + ${INSTALL_DATA} ${WRKSRC}/../../freebsd/lib${MODEL}/libphobos2.a ${STAGEDIR}${PREFIX}/lib ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd.conf + ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd32.conf + ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin64/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd64.conf cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} samples ${STAGEDIR}${EXAMPLESDIR} ${MKDIR} ${STAGEDIR}${MODULEDIR}/etc/c ${INSTALL_DATA} ${WRKSRC}/../phobos/*.d ${STAGEDIR}${MODULEDIR} Added: head/lang/dmd2/files/patch-freebsd__bin32__dmd.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/dmd2/files/patch-freebsd__bin32__dmd.conf Wed Feb 25 00:30:55 2015 (r379858) @@ -0,0 +1,9 @@ +--- ../../freebsd/bin32/dmd.conf.orig 2014-10-15 19:23:36.000000000 -0700 ++++ ../../freebsd/bin32/dmd.conf 2015-02-24 16:02:48.323239133 -0800 +@@ -1,5 +1,2 @@ + [Environment32] +-DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic +- +-[Environment64] +-DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic ++DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib -L--export-dynamic Added: head/lang/dmd2/files/patch-freebsd__bin64__dmd.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/dmd2/files/patch-freebsd__bin64__dmd.conf Wed Feb 25 00:30:55 2015 (r379858) @@ -0,0 +1,8 @@ +--- ../../freebsd/bin64/dmd.conf.orig 2014-10-15 19:23:36.000000000 -0700 ++++ ../../freebsd/bin64/dmd.conf 2015-02-24 16:08:20.814712651 -0800 +@@ -2,4 +2,4 @@ + DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic + + [Environment64] +-DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic ++DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib -L--export-dynamic Added: head/lang/dmd2/files/patch-src__dmd__link.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/dmd2/files/patch-src__dmd__link.c Wed Feb 25 00:30:55 2015 (r379858) @@ -0,0 +1,11 @@ +--- ../../src/dmd/link.c.orig 2014-10-15 19:23:32.000000000 -0700 ++++ ../../src/dmd/link.c 2015-02-24 16:12:51.633410115 -0800 +@@ -446,7 +446,7 @@ + + const char *cc = getenv("CC"); + if (!cc) +- cc = "gcc"; ++ cc = "cc"; + argv.push(cc); + argv.insert(1, global.params.objfiles); + Modified: head/lang/dmd2/pkg-plist ============================================================================== --- head/lang/dmd2/pkg-plist Wed Feb 25 00:22:39 2015 (r379857) +++ head/lang/dmd2/pkg-plist Wed Feb 25 00:30:55 2015 (r379858) @@ -1,7 +1,8 @@ bin/dmd lib/libphobos2.a @sample etc/dmd.conf.sample -%%EXAMPLESDIR%%/dmd.conf +%%EXAMPLESDIR%%/dmd32.conf +%%EXAMPLESDIR%%/dmd64.conf %%EXAMPLESDIR%%/samples/d/all.sh %%EXAMPLESDIR%%/samples/d/build.bat %%EXAMPLESDIR%%/samples/d/chello.d
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502250030.t1P0UuMu035958>