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/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | |
| parent | Tidy up couple of problems in the previous update. (diff) | |
Fix few more mismerges in the previous update.
Notes
Notes:
svn path=/head/; revision=392605
Diffstat (limited to 'java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | 18 |
1 files changed, 9 insertions, 9 deletions
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), \ |