/[packages]/cauldron/java-1.8.0-openjdk/current/SOURCES/system-lcmsAARCH64.patch
ViewVC logotype

Diff of /cauldron/java-1.8.0-openjdk/current/SOURCES/system-lcmsAARCH64.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 489355 by dmorgan, Sun Aug 4 21:32:45 2013 UTC revision 489356 by dmorgan, Sun Sep 29 20:41:25 2013 UTC
# Line 48  diff --git a/common/autoconf/libraries.m Line 48  diff --git a/common/autoconf/libraries.m
48   # Check for the zlib library   # Check for the zlib library
49   #   #
50    
51  diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/CompileNativeLibraries.gmk  diff -up ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk.sav ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk
52  --- jdk8/jdk/makefiles/CompileNativeLibraries.gmk  --- ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk.sav 2013-08-13 12:37:05.000000000 -0400
53  +++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk  +++ ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk     2013-08-13 14:31:24.000000000 -0400
54  @@ -1215,8 +1215,8 @@  @@ -1224,8 +1224,8 @@ BUILD_LIBRARIES += $(BUILD_LIBJSDT)
55    
56   ifdef OPENJDK   ifdef OPENJDK
57       # TODO: Update awt lib path when awt is converted       # TODO: Update awt lib path when awt is converted
# Line 62  diff --git jdk8/jdk/makefiles/CompileNat Line 62  diff --git jdk8/jdk/makefiles/CompileNat
62                   OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\                   OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
63                   SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\                   SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\
64                  LANG:=C,\                  LANG:=C,\
65  @@ -1234,18 +1234,18 @@  @@ -1243,18 +1243,18 @@ ifdef OPENJDK
66                  LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\                  LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\
67                  LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm -lc,\                  LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm -lc,\
68                  LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\                  LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\
# Line 73  diff --git jdk8/jdk/makefiles/CompileNat Line 73  diff --git jdk8/jdk/makefiles/CompileNat
73  -                         -D "JDK_FNAME=lcms.dll" \  -                         -D "JDK_FNAME=lcms.dll" \
74  -                         -D "JDK_INTERNAL_NAME=lcms" \  -                         -D "JDK_INTERNAL_NAME=lcms" \
75  +                         -D "JDK_FNAME=javalcms.dll" \  +                         -D "JDK_FNAME=javalcms.dll" \
76  +                         -D "JDK_INTERNAL_NAME=libjavalcms" \  +                         -D "JDK_INTERNAL_NAME=javalcms" \
77                            -D "JDK_FTYPE=0x2L",\                            -D "JDK_FTYPE=0x2L",\
78                  OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\                  OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\
79                  DEBUG_SYMBOLS:=true))                  DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
80    
81  -    BUILD_LIBRARIES += $(BUILD_LIBLCMS)  -    BUILD_LIBRARIES += $(BUILD_LIBLCMS)
 -  
 -    $(BUILD_LIBLCMS) : $(BUILD_LIBAWT)  
82  +    BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)  +    BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
83  +  
84    -    $(BUILD_LIBLCMS) : $(BUILD_LIBAWT)
85  +    $(BUILD_LIBJAVALCMS) : $(BUILD_LIBAWT)  +    $(BUILD_LIBJAVALCMS) : $(BUILD_LIBAWT)
86   endif   endif
87    
Legend:
Removed from v.489355  
changed lines
  Added in v.489356
  ViewVC Help
Powered by ViewVC 1.1.30