diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2019-03-29 17:39:15 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2019-03-29 17:39:15 +0000 |
| commit | 42f8b4781f7d18cbdca0f40f39d19dc3ad3d3b84 (patch) | |
| tree | 3ec58ef11cd1c570773ea1cf133b26f962ac8148 /java/openjdk12/files/patch-make_autoconf_libraries.m4 | |
| parent | Fix the following two build errors on GCC-based architectures, similar (diff) | |
* Update to 12.0.0.33.2
* Sort LIB_DEPENDS and USE_XORG.
* Add a dependency in alsa-lib now that sound is supported on FreeBSD.
* Don't disable dtrace now that it is supported on FreeBSD.
* Less intrusive iconv change.
Notes
Notes:
svn path=/head/; revision=497173
Diffstat (limited to 'java/openjdk12/files/patch-make_autoconf_libraries.m4')
| -rw-r--r-- | java/openjdk12/files/patch-make_autoconf_libraries.m4 | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/java/openjdk12/files/patch-make_autoconf_libraries.m4 b/java/openjdk12/files/patch-make_autoconf_libraries.m4 index 4c3f45ca80d0..11f8769f67c6 100644 --- a/java/openjdk12/files/patch-make_autoconf_libraries.m4 +++ b/java/openjdk12/files/patch-make_autoconf_libraries.m4 @@ -1,19 +1,15 @@ ---- make/autoconf/libraries.m4 -+++ make/autoconf/libraries.m4 -@@ -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 -- ICONV_CFLAGS="-I$PACKAGE_PATH/include" -- ICONV_LDFLAGS="-L$PACKAGE_PATH/lib" -+ if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then +--- make/autoconf/libraries.m4.orig 2019-03-28 16:54:58.823145000 -0700 ++++ make/autoconf/libraries.m4 2019-03-28 16:55:45.533206000 -0700 +@@ -186,9 +186,9 @@ + ICONV_LDFLAGS="-L/usr/local/lib" + ICONV_LIBS=-liconv + else +- ICONV_CFLAGS= +- ICONV_LDFLAGS= +- ICONV_LIBS= + 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 - else - ICONV_CFLAGS= + fi + else + ICONV_CFLAGS= |