diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-07-20 22:10:17 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-07-20 22:10:17 +0000 |
| commit | 139ceeaf09705dee8fbdc06b50244b383a455434 (patch) | |
| tree | 4ab12aeb30e0ad82e3a8b1914fd94f1dfe5e942c /java/openjdk8 | |
| parent | 1ee26da0bbcc776a7a5994523aaf1dd195dbab59 (diff) | |
| download | ports-139ceeaf09705dee8fbdc06b50244b383a455434.tar.gz ports-139ceeaf09705dee8fbdc06b50244b383a455434.zip | |
Notes
Diffstat (limited to 'java/openjdk8')
3 files changed, 20 insertions, 16 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk index 42b66e13e3e0..280ab417d19b 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk @@ -14,7 +14,7 @@ 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) -L$(PACKAGE_PATH)/lib -liconv -pthread -+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib %%ICONV_LDFLAGS%% -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 diff --git a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk index 5ff9fc8d7df3..03a227762827 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk @@ -1,11 +1,15 @@ --- jdk/make/lib/CoreLibraries.gmk.orig 2015-07-18 14:40:01.000000000 -0700 +++ jdk/make/lib/CoreLibraries.gmk 2015-07-18 14:40:47.000000000 -0700 -@@ -523,11 +523,11 @@ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/share/npt \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \ -- CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \ -+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \ +@@ -510,7 +510,7 @@ + ifeq ($(OPENJDK_TARGET_OS), bsd) + BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include + ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) +- BSD_ICONV_CFLAGS += -DLIBICONV_PLUG ++ BSD_ICONV_CFLAGS += %%ICONV_CPPFLAGS%% + endif + endif + +@@ -527,7 +527,7 @@ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk index 01264c9e4c63..5303ddd2016b 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk @@ -1,14 +1,14 @@ --- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2015-07-18 14:43:00.000000000 -0700 +++ jdk/make/lib/ServiceabilityLibraries.gmk 2015-07-18 14:44:25.000000000 -0700 -@@ -269,7 +269,7 @@ - CFLAGS := $(LIBINSTRUMENT_CFLAGS), \ - CFLAGS_debug := -DJPLIS_LOGGING, \ - CFLAGS_release := -DNO_JPLIS_LOGGING, \ -- CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \ -+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN) \ +@@ -255,7 +255,7 @@ + endif + BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include + ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) +- BSD_ICONV_CFLAGS += -DLIBICONV_PLUG ++ BSD_ICONV_CFLAGS += %%ICONV_CPPFLAGS%% + endif + endif + @@ -283,7 +283,7 @@ LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \ LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \ |