From f2b13a0c4f8c08c1f888b2be6fe87445abe095be Mon Sep 17 00:00:00 2001 From: Jacek Konieczny Date: Fri, 22 Nov 2013 13:03:49 +0100 Subject: [PATCH] A possible fix to the Zero (i486) build added A patch found in the IcedTea repository: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/rev/9d01164b2dfc --- icedtea7-zero_le.patch | 22 ++++++++++++++++++++++ icedtea7.spec | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 icedtea7-zero_le.patch diff --git a/icedtea7-zero_le.patch b/icedtea7-zero_le.patch new file mode 100644 index 0000000..4160a28 --- /dev/null +++ b/icedtea7-zero_le.patch @@ -0,0 +1,22 @@ +diff -dur openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make +--- openjdk.orig/hotspot/make/bsd/makefiles/vm.make 2013-10-16 16:17:08.000000000 +0200 ++++ openjdk/hotspot/make/bsd/makefiles/vm.make 2013-11-22 12:35:42.049971299 +0100 +@@ -27,6 +27,7 @@ + + # Common build rules. + MAKEFILES_DIR=$(GAMMADIR)/make/$(Platform_os_family)/makefiles ++include $(GAMMADIR)/make/defs.make + include $(MAKEFILES_DIR)/rules.make + include $(GAMMADIR)/make/altsrc.make + +diff -dur openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make +--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2013-10-16 16:17:08.000000000 +0200 ++++ openjdk/hotspot/make/linux/makefiles/vm.make 2013-11-22 12:35:42.049971299 +0100 +@@ -27,6 +27,7 @@ + + # Common build rules. + MAKEFILES_DIR=$(GAMMADIR)/make/$(Platform_os_family)/makefiles ++include $(GAMMADIR)/make/defs.make + include $(MAKEFILES_DIR)/rules.make + include $(GAMMADIR)/make/altsrc.make + diff --git a/icedtea7.spec b/icedtea7.spec index c6c8d1d..c489bab 100644 --- a/icedtea7.spec +++ b/icedtea7.spec @@ -59,6 +59,7 @@ Patch0: %{name}-i486.patch Patch1: %{name}-never_test_gamma.patch # patches applied to the extracted sources Patch100: %{name}-libpath.patch +Patch101: %{name}-zero_le.patch URL: http://icedtea.classpath.org/wiki/Main_Page BuildRequires: alsa-lib-devel BuildRequires: ant @@ -401,7 +402,7 @@ Przykłady dla OpenJDK. # patches to applied to the extracted sources install -d pld-patches -cp -p %{PATCH100} pld-patches +cp -p %{PATCH100} %{PATCH101} pld-patches # let the build system extract the sources where it wants them install -d drops -- 2.44.0