diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2019-03-28 23:19:00 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2019-03-28 23:19:00 +0000 |
| commit | d98a910efa50ef4513b16989b8cd04a8f1934135 (patch) | |
| tree | 3460ea61fb342c19fda25926612c5c625b716ff5 /java/openjdk11/files | |
| parent | - Update to 1.4.0. (diff) | |
Refine r496923.
libinstrument.so and libjdwp.so do not need anything from $LOCALBASE but
libsplashscreen.so does. For example,
% cd /usr/local/openjdk11
% bin/java -jar demo/jfc/SwingSet2/SwingSet2.jar
ld-elf.so.1: /usr/local/openjdk11/lib/libsplashscreen.so: Undefined symbol
"libiconv_open"
PR: 236759
Notes
Notes:
svn path=/head/; revision=497060
Diffstat (limited to 'java/openjdk11/files')
| -rw-r--r-- | java/openjdk11/files/patch-make_autoconf_libraries.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/openjdk11/files/patch-make_autoconf_libraries.m4 b/java/openjdk11/files/patch-make_autoconf_libraries.m4 index d496b441a333..4c3f45ca80d0 100644 --- a/java/openjdk11/files/patch-make_autoconf_libraries.m4 +++ b/java/openjdk11/files/patch-make_autoconf_libraries.m4 @@ -1,11 +1,17 @@ --- make/autoconf/libraries.m4 +++ make/autoconf/libraries.m4 -@@ -182,8 +182,8 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], +@@ -181,9 +181,13 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], + LIBS="$save_LIBS" if test "x$OPENJDK_TARGET_OS" = "xbsd"; then - if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then +- if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then - ICONV_CFLAGS="-I$PACKAGE_PATH/include" - ICONV_LDFLAGS="-L$PACKAGE_PATH/lib" ++ if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then ++ ICONV_CFLAGS=%%ICONV_CFLAGS%% ++ ICONV_LDFLAGS=%%ICONV_LDFLAGS%% ++ ICONV_LIBS=%%ICONV_LIBS%% ++ elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then + ICONV_CFLAGS="-I/usr/local/include" + ICONV_LDFLAGS="-L/usr/local/lib" ICONV_LIBS=-liconv |