aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2013-10-03 22:14:03 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2013-10-03 22:14:03 +0200
commitde06956f93ecd15d8c941a05da47a4425e3d397a (patch)
tree4abbb9a3d029a1fd9e2eebe2f0bdb58d577d5789
parenta13ddc9e5e09ee92690e0128d115ab6e3f0c9541 (diff)
downloadmeta-java-de06956f93ecd15d8c941a05da47a4425e3d397a.tar.gz
meta-java-de06956f93ecd15d8c941a05da47a4425e3d397a.tar.bz2
meta-java-de06956f93ecd15d8c941a05da47a4425e3d397a.zip
openjdk: fix qa error for bad rpath inside cacao's libjvm.so
* --with-libtool-sysroot needs a path, so it filters out wrong rpath settings * using ${ALT_FREETYPE_LIB_PATH} for this inside the icedtea Makefile because we already export it * bump PR manually on all buildable versions
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch4
-rw-r--r--recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch4
-rw-r--r--recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb2
-rw-r--r--recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb2
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch4
-rw-r--r--recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb2
6 files changed, 9 insertions, 9 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch
index e23bae5..8812cf2 100644
--- a/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch
+++ b/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch
@@ -27,7 +27,7 @@ Index: icedtea6/Makefile.am
+ --host=$(host_alias) \
+ --build=$(build_alias) \
+ --target=$(target_alias) \
-+ --with-libtool-sysroot ; \
++ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \
+ $(ARCH_PREFIX) $(MAKE) ; \
+ $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/install
mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
@@ -49,7 +49,7 @@ Index: icedtea6/Makefile.am
--host=$(host_alias) \
--build=$(build_alias) \
--target=$(target_alias) \
-+ --with-libtool-sysroot \
++ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \
--prefix=$(abs_top_builddir)/cacao/install \
--with-java-runtime-library=openjdk \
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
diff --git a/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch
index b1e679d..1ecdef6 100644
--- a/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch
+++ b/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch
@@ -27,7 +27,7 @@ Index: icedtea6-1.12.4/Makefile.am
+ --host=$(host_alias) \
+ --build=$(build_alias) \
+ --target=$(target_alias) \
-+ --with-libtool-sysroot ; \
++ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \
+ $(ARCH_PREFIX) $(MAKE) ; \
+ $(ARCH_PREFIX) $(MAKE) install
mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
@@ -37,7 +37,7 @@ Index: icedtea6-1.12.4/Makefile.am
--host=$(host_alias) \
--build=$(build_alias) \
--target=$(target_alias) \
-+ --with-libtool-sysroot \
++ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \
--prefix=$(abs_top_builddir)/cacao/install \
--with-java-runtime-library=openjdk \
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
diff --git a/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb b/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb
index 2c2d6cc..3daffba 100644
--- a/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb
+++ b/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb
@@ -1,6 +1,6 @@
require openjdk-6-release-6b24.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI[iced.md5sum] = "1826c4bfb4faae1e820dd8997428a831"
SRC_URI[iced.sha256sum] = "0c134bea8d48c77ad5d41d4a0f98f471c381faaa0ef0c215d48687e709e93f3f"
diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb
index d2ec757..9660a15 100644
--- a/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb
+++ b/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb
@@ -1,6 +1,6 @@
require openjdk-6-release-6b27.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
SRC_URI[iced.md5sum] = "2299fde9f315c7feb561c2975aa232b1"
SRC_URI[iced.sha256sum] = "c61d6eb2f98d5c4059bb6eb6d808dd0954cf7d35c14290e5c77c3d7db75d2b35"
diff --git a/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch b/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch
index 5eccc68..bf68037 100644
--- a/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch
@@ -24,7 +24,7 @@ Index: icedtea-2.3.12/Makefile.am
+ --host=$(host_alias) \
+ --build=$(build_alias) \
+ --target=$(target_alias) \
-+ --with-libtool-sysroot ; \
++ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \
$(MAKE) ; \
$(MAKE) install
mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
@@ -32,7 +32,7 @@ Index: icedtea-2.3.12/Makefile.am
--host=$(host_alias) \
--build=$(build_alias) \
--target=$(target_alias) \
-+ --with-libtool-sysroot \
++ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \
--prefix=$(abs_top_builddir)/cacao/install \
--with-java-runtime-library=openjdk7 \
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
diff --git a/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb b/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb
index 9058e42..dcaf8bf 100644
--- a/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb
+++ b/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb
@@ -1,6 +1,6 @@
require openjdk-7-release-25b30.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI[iced.md5sum] = "9b3afa162021e3fca6161ba8f9f7dc11"
SRC_URI[iced.sha256sum] = "3c4e88e7c1b2b39dcd7ed65c3b9a1a8dbd2a48848ce42e1d8a22a6821cf890d1"