/hg/icedtea8-forest/jdk: PR2759: LCMS library should be named ja...

[andrew at icedtea.classpath.org]

changeset c4b25140f059 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=c4b25140f059
author: andrew
date: Tue Dec 01 03:08:23 2015 +0000

	PR2759: LCMS library should be named javalcms, not lcms, to avoid potential conflicts with the system library


diffstat:

 make/lib/Awt2dLibraries.gmk                     |  26 ++++++++++++------------
 src/share/classes/sun/java2d/cmm/lcms/LCMS.java |   2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diffs (75 lines):

diff -r 7d090e59ad8d -r c4b25140f059 make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk	Fri Nov 06 17:27:27 2015 -0500
+++ b/make/lib/Awt2dLibraries.gmk	Tue Dec 01 03:08:23 2015 +0000
@@ -666,33 +666,33 @@
 
 ##########################################################################################
 
-LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
+LIBJAVALCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
 
 ifeq ($(USE_EXTERNAL_LCMS), true)
   # If we're using an external library, we'll just need the wrapper part.
   # By including it explicitely, all other files will be excluded.
-  BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
-  BUILD_LIBLCMS_HEADERS :=
+  BUILD_LIBJAVALCMS_INCLUDE_FILES := LCMS.c
+  BUILD_LIBJAVALCMS_HEADERS :=
 else
-  BUILD_LIBLCMS_INCLUDE_FILES :=
+  BUILD_LIBJAVALCMS_INCLUDE_FILES :=
   # If we're using the bundled library, we'll need to include it in the
   # include path explicitly. Otherwise the system headers will be used.
-  BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
+  BUILD_LIBJAVALCMS_HEADERS := -I$(LIBJAVALCMS_DIR)
 endif
 
 # TODO: Update awt lib path when awt is converted
-$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
-    LIBRARY := lcms, \
+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVALCMS, \
+    LIBRARY := javalcms, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-    SRC := $(LIBLCMS_DIR), \
-    INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
+    SRC := $(LIBJAVALCMS_DIR), \
+    INCLUDE_FILES := $(BUILD_LIBJAVALCMS_INCLUDE_FILES), \
     LANG := C, \
     OPTIMIZATION := HIGHEST, \
     CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
         $(SHARED_LIBRARY_FLAGS) \
         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
-        $(BUILD_LIBLCMS_HEADERS) \
+        $(BUILD_LIBJAVALCMS_HEADERS) \
         $(LCMS_CFLAGS), \
     CFLAGS_solaris := -xc99=no_lib, \
     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
@@ -710,12 +710,12 @@
         -D "JDK_FNAME=lcms.dll" \
         -D "JDK_INTERNAL_NAME=lcms" \
         -D "JDK_FTYPE=0x2L", \
-    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
+    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavalcms, \
     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
 
-BUILD_LIBRARIES += $(BUILD_LIBLCMS)
+BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
 
-$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
+$(BUILD_LIBJAVALCMS): $(BUILD_LIBAWT)
 
 ##########################################################################################
 
diff -r 7d090e59ad8d -r c4b25140f059 src/share/classes/sun/java2d/cmm/lcms/LCMS.java
--- a/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	Fri Nov 06 17:27:27 2015 -0500
+++ b/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	Tue Dec 01 03:08:23 2015 +0000
@@ -207,7 +207,7 @@
                          * disposer frameworks
                          */
                         System.loadLibrary("awt");
-                        System.loadLibrary("lcms");
+                        System.loadLibrary("javalcms");
                         return null;
                     }
                 });