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-7-25b30 | |
| 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-7-25b30')
| -rw-r--r-- | recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
| 24 | + --host=$(host_alias) \ | 24 | + --host=$(host_alias) \ |
| 25 | + --build=$(build_alias) \ | 25 | + --build=$(build_alias) \ |
| 26 | + --target=$(target_alias) \ | 26 | + --target=$(target_alias) \ |
| 27 | + --with-libtool-sysroot ; \ | 27 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \ |
| 28 | $(MAKE) ; \ | 28 | $(MAKE) ; \ |
| 29 | $(MAKE) install | 29 | $(MAKE) install |
| 30 | mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | 30 | 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 | |||
| 32 | --host=$(host_alias) \ | 32 | --host=$(host_alias) \ |
| 33 | --build=$(build_alias) \ | 33 | --build=$(build_alias) \ |
| 34 | --target=$(target_alias) \ | 34 | --target=$(target_alias) \ |
| 35 | + --with-libtool-sysroot \ | 35 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \ |
| 36 | --prefix=$(abs_top_builddir)/cacao/install \ | 36 | --prefix=$(abs_top_builddir)/cacao/install \ |
| 37 | --with-java-runtime-library=openjdk7 \ | 37 | --with-java-runtime-library=openjdk7 \ |
| 38 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ | 38 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ |