From 139ceeaf09705dee8fbdc06b50244b383a455434 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Mon, 20 Jul 2015 22:10:17 +0000 Subject: Fix few more mismerges in the previous update. --- java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk') 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), \ -- cgit v1.2.3