diff options
| author | ryoon <ryoon@pkgsrc.org> | 2021-08-04 17:06:35 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2021-08-04 17:06:35 +0000 |
| commit | ddfd63718fff243dcab3f6f1a7db3de74265c40f (patch) | |
| tree | f3c8f8af2455e96dbb750272ef1729bbd8ab0cb2 /lang | |
| parent | a4f780be59380dce847af0abd2c1ad9e67abbeee (diff) | |
| download | pkgsrc-ddfd63718fff243dcab3f6f1a7db3de74265c40f.tar.gz | |
openjdk11: Internal libraries should not use PREFIX/lib for rpath
libjsound.so on NetBSD uses PREFIX/lib/libasound.so and add PREFIX/lib
to rpath of libjsound.so.
Fix confusion against devel/libnet.
Reported by manu@ on tech-pkg@.
Bump PKGREVISON.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/openjdk11/Makefile | 6 | ||||
| -rw-r--r-- | lang/openjdk11/distinfo | 3 | ||||
| -rw-r--r-- | lang/openjdk11/patches/patch-make_autoconf_lib-alsa.m4 | 24 |
3 files changed, 30 insertions, 3 deletions
diff --git a/lang/openjdk11/Makefile b/lang/openjdk11/Makefile index 517063b764d..a9ff167742d 100644 --- a/lang/openjdk11/Makefile +++ b/lang/openjdk11/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2021/06/27 08:53:54 tnn Exp $ +# $NetBSD: Makefile,v 1.35 2021/08/04 17:06:35 ryoon Exp $ DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/} PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} GITHUB_PROJECT= openjdk-jdk11u @@ -59,7 +60,8 @@ CONFIGURE_ARGS+= --with-num-cores=${MAKE_JOBS:U1} CONFIGURE_ARGS+= --disable-precompiled-headers CONFIGURE_ARGS+= --disable-ccache CONFIGURE_ARGS+= --disable-javac-server -CONFIGURE_ARGS+= --with-extra-ldflags=${LDFLAGS:Q} +# Do not include ${PREFIX} (/usr/pkg) for internal libraries. +#CONFIGURE_ARGS+= --with-extra-ldflags=${LDFLAGS:Q} CONFIGURE_ARGS+= --with-extra-cflags=${CFLAGS:Q} CONFIGURE_ARGS+= --with-extra-cxxflags=${CXXFLAGS:Q} CONFIGURE_ARGS+= --disable-warnings-as-errors diff --git a/lang/openjdk11/distinfo b/lang/openjdk11/distinfo index 47eccfe28f2..1263f91f1e5 100644 --- a/lang/openjdk11/distinfo +++ b/lang/openjdk11/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2021/06/28 22:53:05 tnn Exp $ +$NetBSD: distinfo,v 1.25 2021/08/04 17:06:35 ryoon Exp $ SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8 @@ -19,6 +19,7 @@ Size (openjdk-jdk11u-jdk-11.0.11-9-1.tar.gz) = 122607262 bytes SHA1 (patch-make_autoconf_basics.m4) = 5a8d3cd229f73eef34fb3860dfae1a813ec39ab5 SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d SHA1 (patch-make_autoconf_jdk-options.m4) = d0d9fbaf29cc521fa4b62b1ea2616dc8f3b07618 +SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c381 SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594 SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54 SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f diff --git a/lang/openjdk11/patches/patch-make_autoconf_lib-alsa.m4 b/lang/openjdk11/patches/patch-make_autoconf_lib-alsa.m4 new file mode 100644 index 00000000000..665ceaffaf9 --- /dev/null +++ b/lang/openjdk11/patches/patch-make_autoconf_lib-alsa.m4 @@ -0,0 +1,24 @@ +$NetBSD: patch-make_autoconf_lib-alsa.m4,v 1.1 2021/08/04 17:06:35 ryoon Exp $ + +* Fix RPATH for libasound.so. These should use COMPILER_RPATH_FLAG. + +--- make/autoconf/lib-alsa.m4.orig 2021-04-24 02:47:22.000000000 +0000 ++++ make/autoconf/lib-alsa.m4 +@@ -52,7 +52,7 @@ AC_DEFUN_ONCE([LIB_SETUP_ALSA], + fi + + if test "x${with_alsa}" != x; then +- ALSA_LIBS="-L${with_alsa}/lib -lasound" ++ ALSA_LIBS="-L${with_alsa}/lib -Wl,-rpath,${with_alsa}/lib -lasound" + ALSA_CFLAGS="-I${with_alsa}/include" + ALSA_FOUND=yes + fi +@@ -61,7 +61,7 @@ AC_DEFUN_ONCE([LIB_SETUP_ALSA], + ALSA_FOUND=yes + fi + if test "x${with_alsa_lib}" != x; then +- ALSA_LIBS="-L${with_alsa_lib} -lasound" ++ ALSA_LIBS="-L${with_alsa_lib} -Wl,-rpath,${with_alsa}/lib -lasound" + ALSA_FOUND=yes + fi + # Do not try pkg-config if we have a sysroot set. |