diff options
| author | joerg <joerg> | 2014-09-13 14:35:25 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-09-13 14:35:25 +0000 |
| commit | 3e9a26d4a81bc18276dd499c022d5bfab4613f00 (patch) | |
| tree | b4ce3619f8f6f5474f76fed30cf265db2372776c /lang/openjdk7/Makefile | |
| parent | cb0ea7cc3bcd5187057a52ce609411668e664b24 (diff) | |
| download | pkgsrc-3e9a26d4a81bc18276dd499c022d5bfab4613f00.tar.gz | |
Only add -lgcc_s explicitly on NetBSD 5. Disable parallel GC in
rules.make and explicitly on calls to ant. Be nice and raise the memory
limit to 1G. Adjust ant rules to also apply SerialGC + 1G limit.
This currently reverts to the default settings for !BSD, if necessary
the changes to rules.make should be copied.
Add a small fragment for providing lang/openjdk7/libs with compat
versions of libstdc++ and libgcc_s to allow using the GCC bootstrap in a
pure clang release. Versions can be obtained from NetBSD 6's base.tgz.
Diffstat (limited to 'lang/openjdk7/Makefile')
| -rw-r--r-- | lang/openjdk7/Makefile | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 05ccccea0de..71f632b0f31 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2014/09/11 13:50:24 joerg Exp $ +# $NetBSD: Makefile,v 1.77 2014/09/13 14:35:25 joerg Exp $ DISTNAME= openjdk-1.7.65-20140719 PKGNAME= openjdk7-1.7.65 @@ -175,25 +175,21 @@ post-extract: ${MKDIR} ${ALT_BOOTDIR}/bin ${LN} -s ${JDK_BOOTDIR}/include ${ALT_BOOTDIR}/include ${LN} -s ${JDK_BOOTDIR}/lib ${ALT_BOOTDIR}/lib - printf '#!/bin/sh\nexec %s/bin/java -mx256m "$$@"\n' \ - ${JDK_BOOTDIR} > ${ALT_BOOTDIR}/bin/java -.else - mv ${ALT_BOOTDIR}/bin/java ${ALT_BOOTDIR}/bin/java-real - printf '#!/bin/sh\nexec %s/bin/java-real -mx256m "$$@"\n' \ - ${ALT_BOOTDIR} > ${ALT_BOOTDIR}/bin/java + ${LN} -s ${JDK_BOOTDIR}/bin/java ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/javac ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/javah ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/javap ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/idlj ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/jar ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/native2ascii ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/rmic ${ALT_BOOTDIR}/bin +.elif ${OPSYS} == "NetBSD" && exists(${.CURDIR}/libs) + cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/} .endif - chmod a+x ${ALT_BOOTDIR}/bin/java -.for t in idlj jar javac javah javap native2ascii rmic -.if ${OPSYS} == "SunOS" - printf '#!/bin/sh\n\nexec %s/bin/${t} -J-mx256m "$$@"\n' \ - ${JDK_BOOTDIR} > ${ALT_BOOTDIR}/bin/${t} -.else - mv ${ALT_BOOTDIR}/bin/${t} ${ALT_BOOTDIR}/bin/${t}-real - printf '#!/bin/sh\n\nexec %s/bin/${t}-real -J-mx256m "$$@"\n' \ - ${ALT_BOOTDIR} > ${ALT_BOOTDIR}/bin/${t} + +.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) +ALL_ENV+= LDFLAGS_LIBGCC=-lgcc_s .endif - chmod a+x ${ALT_BOOTDIR}/bin/${t} -.endfor do-build: ${WRKDIR}/stage3-done |