diff options
| author | tnn <tnn> | 2015-02-08 05:55:29 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-02-08 05:55:29 +0000 |
| commit | ce9c7911222286c4b1d3c19893effcd96bebf917 (patch) | |
| tree | 97d0e13a90e975647d4ca729f822f5564007e698 /lang | |
| parent | 9b84983fa4fb9138ed794736eb14598b3e2dc73a (diff) | |
| download | pkgsrc-ce9c7911222286c4b1d3c19893effcd96bebf917.tar.gz | |
Don't need to set -DDEFAULT_LIBPATH on compiler command line when it's
handled in a patch already.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/openjdk7/Makefile | 3 | ||||
| -rw-r--r-- | lang/openjdk7/distinfo | 4 | ||||
| -rw-r--r-- | lang/openjdk7/patches/patch-aa | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index d1533f35ce1..531a1ee72a7 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2015/02/07 22:35:24 tnn Exp $ +# $NetBSD: Makefile,v 1.86 2015/02/08 05:55:29 tnn Exp $ DISTNAME= openjdk-1.7.76-20150127 PKGNAME= openjdk7-1.7.76 @@ -69,7 +69,6 @@ MAKE_ENV+= SKIP_DEBUG_BUILD=yes MAKE_ENV+= JAVA_HOME= MAKE_ENV+= CLASSPATH= -MAKE_ENV+= EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\"" BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/} LD_LIBRARY_PATH= ${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index f9c040ba90c..2b370c455ab 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.67 2015/02/07 22:35:24 tnn Exp $ +$NetBSD: distinfo,v 1.68 2015/02/08 05:55:29 tnn Exp $ SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 @@ -43,7 +43,7 @@ SHA1 (openjdk7/rhino1_7R4.zip) = 483e097cb575c724c745edd80c9512f073bd510a RMD160 (openjdk7/rhino1_7R4.zip) = fba5ce71edd396a241991fb7b3ce43628b891035 Size (openjdk7/rhino1_7R4.zip) = 6481918 bytes SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6 -SHA1 (patch-aa) = d47738b934304ee0921fe56b036fc0483faa328b +SHA1 (patch-aa) = 33197f638bb8516e3ecc465e32e15db5381c2aae SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998 SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 SHA1 (patch-ae) = 843f05cfe8f18d080cae80eed92d9ad89a5c0917 diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa index b409ba52bcc..80059babb45 100644 --- a/lang/openjdk7/patches/patch-aa +++ b/lang/openjdk7/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.12 2014/07/25 20:35:14 ryoon Exp $ +$NetBSD: patch-aa,v 1.13 2015/02/08 05:55:29 tnn Exp $ DragonFly support. Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 @@ -51,7 +51,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 */ #ifndef DEFAULT_LIBPATH -#define DEFAULT_LIBPATH "/lib:/usr/lib" -+#define DEFAULT_LIBPATH "/lib:/usr/lib:@PREFIX@/lib" ++#define DEFAULT_LIBPATH "@PREFIX@/lib/jni:@PREFIX@/lib:/lib:/usr/lib" #endif #define EXTENSIONS_DIR "/lib/ext" |