CVS commit: pkgsrc/lang/openjdk11

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Aug  4 17:06:35 UTC 2021

Modified Files:
        pkgsrc/lang/openjdk11: Makefile distinfo
Added Files:
        pkgsrc/lang/openjdk11/patches: patch-make_autoconf_lib-alsa.m4

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-alsa.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.34 pkgsrc/lang/openjdk11/Makefile:1.35
--- pkgsrc/lang/openjdk11/Makefile:1.34 Sun Jun 27 08:53:54 2021
+++ pkgsrc/lang/openjdk11/Makefile      Wed Aug  4 17:06:35 2021
@@ -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
 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

Index: pkgsrc/lang/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.24 pkgsrc/lang/openjdk11/distinfo:1.25
--- pkgsrc/lang/openjdk11/distinfo:1.24 Mon Jun 28 22:53:05 2021
+++ pkgsrc/lang/openjdk11/distinfo      Wed Aug  4 17:06:35 2021
@@ -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
 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

Added files:

Index: pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-alsa.m4
diff -u /dev/null pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-alsa.m4:1.1
--- /dev/null   Wed Aug  4 17:06:35 2021
+++ pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-alsa.m4       Wed Aug  4 17:06:35 2021
@@ -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.