From 86dcea5c7a52542294c97de392803937ec111cc4 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Thu, 15 May 2014 23:53:56 +0000 Subject: Add support for java/icedtea-web. Clean up some patches while I am here. --- .../files/patch-jdk-make-lib-Awt2dLibraries.gmk | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk (limited to 'java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk') diff --git a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk new file mode 100644 index 000000000000..9982af85d462 --- /dev/null +++ b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk @@ -0,0 +1,20 @@ +--- jdk/make/lib/Awt2dLibraries.gmk ++++ jdk/make/lib/Awt2dLibraries.gmk +@@ -1243,6 +1243,8 @@ + LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 + else ifeq ($(OPENJDK_TARGET_OS), solaris) + LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions ++ else ifeq ($(OPENJDK_TARGET_OS), bsd) ++ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) %%ICONV_CPPFLAGS%% + else + LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) + endif +@@ -1267,7 +1269,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) +- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -liconv -pthread ++ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread + else # .. all other Unixes can use X_LIBS + LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread + endif -- cgit v1.2.3