From de06956f93ecd15d8c941a05da47a4425e3d397a Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 3 Oct 2013 22:14:03 +0200 Subject: 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 --- recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch') 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 \ -- cgit v1.2.3-54-g00ecf