From eccd4352ff0fb53b6849c9a13b61d26f02287040 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Jul 30 2013 13:24:22 +0000 Subject: added patch 301 - removeMswitchesFromx11.patch --- diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 7e2a5a1..66cb10d 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -215,6 +215,7 @@ Patch2031: system-lcmsAARCH64.patch #created by removing all -m64 switches from makefiles #find java-1.8.0-openjdk/jdk8/ -not -name "*.java" -type f -exec sed -i "s/\\-m64/ /g" '{}' \; Patch300: removeM64switches.patch +Patch301: removeMswitchesFromx11.patch BuildRequires: autoconf BuildRequires: automake @@ -406,6 +407,7 @@ sh %{SOURCE12} %ifarch %{aarch64} %patch300 +%patch301 %endif # Extract systemtap tapsets @@ -947,7 +949,9 @@ exit 0 %changelog * Mon Jul 29 2013 Jiri Vanek - 1:1.8.0.0-0.14.b89 -- added patch 300 - removeM64switches.patch to attempt anbuild +- added patch 300 - removeM64switches.patch +- added patch 301 - removeMswitchesFromx11.patch + * Fri Jul 26 2013 Jiri Vanek - 1:1.8.0.0-0.13.b89 - added new aarch64 tarball diff --git a/removeMswitchesFromx11.patch b/removeMswitchesFromx11.patch new file mode 100644 index 0000000..7f3bcb7 --- /dev/null +++ b/removeMswitchesFromx11.patch @@ -0,0 +1,12 @@ +diff -r b28c6241e16e -r 3c777c472368 makefiles/GensrcX11Wrappers.gmk +--- jdk8/jdk/makefiles/GensrcX11Wrappers.gmk Tue Jul 09 16:04:18 2013 +0100 ++++ jdk8/jdk/makefiles/GensrcX11Wrappers.gmk Thu Jul 25 11:32:02 2013 +0100 +@@ -89,7 +89,7 @@ + # Compile the C code into an executable. + $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c + $(MKDIR) -p $(@D) +- (cd $(@D) && $(CC) -m$* -o $@ $< \ ++ (cd $(@D) && $(CC) -o $@ $< \ + $(X_CFLAGS) \ + $(X_LIBS) \ + -I$(JDK_OUTPUTDIR)/include \