diff --git a/java-1.7.0-openjdk-rh740762-setlibdir.patch b/java-1.7.0-openjdk-rh740762-setlibdir.patch new file mode 100644 index 0000000..424643d --- /dev/null +++ b/java-1.7.0-openjdk-rh740762-setlibdir.patch @@ -0,0 +1,33 @@ +diff -up ./openjdk/hotspot/make/linux/makefiles/vm.make.sav ./openjdk/hotspot/make/linux/makefiles/vm.make +--- ./openjdk/hotspot/make/linux/makefiles/vm.make.sav 2012-03-12 14:50:26.501783501 -0400 ++++ ./openjdk/hotspot/make/linux/makefiles/vm.make 2012-03-12 15:02:27.884518939 -0400 +@@ -87,6 +87,7 @@ HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(L + BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" + BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" + VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" ++REG_DIR = -DREG_DIR="\"$(JNI_LOC)\"" + + CPPFLAGS = \ + ${SYSDEFS} \ +@@ -96,6 +97,7 @@ CPPFLAGS = \ + ${BUILD_USER} \ + ${HS_LIB_ARCH} \ + ${JRE_VERSION} \ ++ ${REG_DIR} \ + ${VM_DISTRO} + + ifdef DERIVATIVE_ID +diff -up ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp.sav ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp.sav 2012-03-12 14:44:14.966559167 -0400 ++++ ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2012-03-12 14:44:33.485271287 -0400 +@@ -393,7 +393,10 @@ void os::init_system_properties_values() + + #define EXTENSIONS_DIR "/lib/ext" + #define ENDORSED_DIR "/lib/endorsed" ++ ++#ifndef REG_DIR + #define REG_DIR "/usr/java/packages" ++#endif + + { + /* sysclasspath, java_home, dll_dir */ diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec index d5f5948..3e05009 100644 --- a/java-1.7.0-openjdk.spec +++ b/java-1.7.0-openjdk.spec @@ -259,6 +259,9 @@ Patch7: %{name}-system-zlib.patch # Remove option no longer accepted by GCC Patch8: %{name}-remove-mimpure-opt.patch +# Allow specification of jni lib dir +Patch9: %{name}-rh740762-setlibdir.patch + # # OpenJDK specific patches # @@ -693,6 +696,7 @@ patch -l -p0 < %{PATCH6} patch -l -p0 < %{PATCH7} patch -l -p0 < %{PATCH8} +patch -l -p0 < %{PATCH9} # Type fixes patch -l -p0 < %{PATCH101} @@ -856,6 +860,7 @@ make \ FT2_LIBS="-lfreetype " \ DEBUG_CLASSFILES="true" \ DEBUG_BINARIES="true" \ + JNI_LOC="%{_jvmdir}/%{sdkdir}" \ %ifnarch %{jit_arches} LIBFFI_CFLAGS="`pkg-config --cflags libffi` " \ LIBFFI_LIBS="-lffi " \ @@ -1387,6 +1392,7 @@ exit 0 %changelog * Mon Mar 12 2012 Deepak Bhole - 1.7.0.3-2.1.fc17.2 +- Resolved rhbz#740762: java.library.path is missing some paths - Unified spec file for x86, x86_64, ARM and s390 - Integrated changes from Dan HorĂ¡k for Zero/s390 - Integrated changes from Chris Phillips for Zero/ARM