diff options
Diffstat (limited to 'java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk index 74afef350bc8..42b66e13e3e0 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk @@ -1,15 +1,15 @@ --- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-07-18 14:30:01.000000000 -0700 +++ jdk/make/lib/Awt2dLibraries.gmk 2015-07-18 14:30:08.000000000 -0700 -@@ -1260,6 +1260,8 @@ +@@ -1259,7 +1259,7 @@ + else ifeq ($(OPENJDK_TARGET_OS), bsd) LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) - LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG -+ else +- LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG + LIBSPLASHSCREEN_CFLAGS += %%ICONV_CPPFLAGS%% endif else LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -@@ -1285,7 +1287,7 @@ +@@ -1285,7 +1285,7 @@ # Solaris still uses OPENWIN_LIB .. LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread else ifeq ($(OPENJDK_TARGET_OS), bsd) |