diff options
Diffstat (limited to 'lang/openjdk7')
| -rw-r--r-- | lang/openjdk7/Makefile | 18 | ||||
| -rw-r--r-- | lang/openjdk7/builtin.mk | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 14c82df7590..c1f86277a7b 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.138 2019/10/01 14:54:31 tnn Exp $ +# $NetBSD: Makefile,v 1.139 2019/11/03 19:04:04 rillig Exp $ JDK_MICRO= 141 DISTNAME= openjdk-1.7.${JDK_MICRO}-20170813 @@ -87,12 +87,12 @@ MAKE_ENV+= SKIP_COMPARE_IMAGES=true MAKE_ENV+= JAVA_HOME= MAKE_ENV+= CLASSPATH= -BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/} -BUILD_ARCH= ${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH} -LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server -MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} +BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/} +BUILD_ARCH= ${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} +LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} +BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH} +LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server +MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH} PLIST_SUBST+= ARCH=${LIBDIR_ARCH} @@ -162,10 +162,10 @@ CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \ -Wno-delete-non-virtual-dtor \ -Wno-return-type -Wno-unused-parameter \ -Wno-parentheses-equality -Wno-empty-body -.if ${OPSYS} != "FreeBSD" +. if ${OPSYS} != "FreeBSD" _WRAP_EXTRA_ARGS.CXX+= -Wno-new-returns-null CWRAPPERS_APPEND.cxx+= -Wno-new-returns-null -.endif +. endif BUILDLINK_TRANSFORM+= rm:-fcheck-new BUILDLINK_TRANSFORM+= rm:-fpch-deps . if ${MACHINE_ARCH} == "x86_64" diff --git a/lang/openjdk7/builtin.mk b/lang/openjdk7/builtin.mk index a4872f86e88..a7317c7a443 100644 --- a/lang/openjdk7/builtin.mk +++ b/lang/openjdk7/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2018/01/02 00:15:08 rillig Exp $ +# $NetBSD: builtin.mk,v 1.4 2019/11/03 19:04:04 rillig Exp $ BUILTIN_PKG:= openjdk7 @@ -19,7 +19,7 @@ IS_BUILTIN.openjdk7= yes IS_BUILTIN.openjdk7= no . endif .endif -MAKEVARS+= IS_BUILTIN.openjdk7 +MAKEVARS+= IS_BUILTIN.openjdk7 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -28,9 +28,9 @@ MAKEVARS+= IS_BUILTIN.openjdk7 .if !defined(BUILTIN_PKG.openjdk7) && \ !empty(IS_BUILTIN.openjdk7:M[yY][eE][sS]) BUILTIN_VERSION.openjdk7!= ${OJDK7} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/' -BUILTIN_PKG.openjdk7= openjdk7-${BUILTIN_VERSION.openjdk7} +BUILTIN_PKG.openjdk7= openjdk7-${BUILTIN_VERSION.openjdk7} .endif -MAKEVARS+= BUILTIN_PKG.openjdk7 +MAKEVARS+= BUILTIN_PKG.openjdk7 ### ### Determine whether we should use the built-in implementation if it @@ -57,7 +57,7 @@ USE_BUILTIN.openjdk7!= \ . endif . endif .endif -MAKEVARS+= USE_BUILTIN.openjdk7 +MAKEVARS+= USE_BUILTIN.openjdk7 ### ### The section below only applies if we are not including this file |