rpms/java-1.8.0-openjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

added patch 301 - removeMswitchesFromx11.patch

Browse Source
This commit is contained in:
Jiri Vanek 2013-07-30 15:24:22 +02:00
parent 60d345fc91
commit eccd4352ff
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java-1.8.0-openjdk.spec
View File

@ -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 <jvanek@redhat.com> - 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 <jvanek@redhat.com> - 1:1.8.0.0-0.13.b89
- added new aarch64 tarball

12
removeMswitchesFromx11.patch Normal file
View File

@ -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 \