aboutsummaryrefslogtreecommitdiff
path: root/java/openjdk11/files/patch-make_autoconf_libraries.m4
diff options
context:
space:
mode:
Diffstat (limited to 'java/openjdk11/files/patch-make_autoconf_libraries.m4')
-rw-r--r--java/openjdk11/files/patch-make_autoconf_libraries.m416
1 files changed, 8 insertions, 8 deletions
diff --git a/java/openjdk11/files/patch-make_autoconf_libraries.m4 b/java/openjdk11/files/patch-make_autoconf_libraries.m4
index 11f8769f67c6..0911464a6522 100644
--- a/java/openjdk11/files/patch-make_autoconf_libraries.m4
+++ b/java/openjdk11/files/patch-make_autoconf_libraries.m4
@@ -1,15 +1,15 @@
---- 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 @@
+--- make/autoconf/libraries.m4~ 2019-08-12 19:10:36.292217000 -0700
++++ make/autoconf/libraries.m4 2019-08-12 19:18:15.523606000 -0700
+@@ -188,9 +188,9 @@
ICONV_LDFLAGS="-L/usr/local/lib"
ICONV_LIBS=-liconv
- else
-- ICONV_CFLAGS=
+ elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
+- ICONV_CFLAGS=-DLIBICONV_PLUG
- ICONV_LDFLAGS=
- ICONV_LIBS=
+ ICONV_CFLAGS=%%ICONV_CFLAGS%%
+ ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
+ ICONV_LIBS=%%ICONV_LIBS%%
- fi
- else
- ICONV_CFLAGS=
+ else
+ ICONV_CFLAGS=
+ ICONV_LDFLAGS=