diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-10-03 22:14:03 +0200 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-10-03 22:14:03 +0200 |
| commit | de06956f93ecd15d8c941a05da47a4425e3d397a (patch) | |
| tree | 4abbb9a3d029a1fd9e2eebe2f0bdb58d577d5789 /recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch | |
| parent | a13ddc9e5e09ee92690e0128d115ab6e3f0c9541 (diff) | |
| download | meta-java-de06956f93ecd15d8c941a05da47a4425e3d397a.tar.gz | |
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
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch')
| -rw-r--r-- | recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch | 4 |
1 files changed, 2 insertions, 2 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 | |||
| 27 | + --host=$(host_alias) \ | 27 | + --host=$(host_alias) \ |
| 28 | + --build=$(build_alias) \ | 28 | + --build=$(build_alias) \ |
| 29 | + --target=$(target_alias) \ | 29 | + --target=$(target_alias) \ |
| 30 | + --with-libtool-sysroot ; \ | 30 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \ |
| 31 | + $(ARCH_PREFIX) $(MAKE) ; \ | 31 | + $(ARCH_PREFIX) $(MAKE) ; \ |
| 32 | + $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/install | 32 | + $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/install |
| 33 | mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | 33 | mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server |
| @@ -49,7 +49,7 @@ Index: icedtea6/Makefile.am | |||
| 49 | --host=$(host_alias) \ | 49 | --host=$(host_alias) \ |
| 50 | --build=$(build_alias) \ | 50 | --build=$(build_alias) \ |
| 51 | --target=$(target_alias) \ | 51 | --target=$(target_alias) \ |
| 52 | + --with-libtool-sysroot \ | 52 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \ |
| 53 | --prefix=$(abs_top_builddir)/cacao/install \ | 53 | --prefix=$(abs_top_builddir)/cacao/install \ |
| 54 | --with-java-runtime-library=openjdk \ | 54 | --with-java-runtime-library=openjdk \ |
| 55 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ | 55 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ |