Remove all patches modifying the old build system
This commit is contained in:
parent
e4ce1fa3d8
commit
7245ea2af1
@ -1,22 +0,0 @@
|
|||||||
diff -up jdk8/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
|
|
||||||
--- jdk8/jdk/make/jdk_generic_profile.sh.sav 2012-02-14 16:12:48.000000000 -0500
|
|
||||||
+++ jdk8/jdk/make/jdk_generic_profile.sh 2012-03-07 17:31:26.154840740 -0500
|
|
||||||
@@ -280,7 +280,7 @@ if [ "${ZERO_BUILD}" = true ] ; then
|
|
||||||
|
|
||||||
# ZERO_ENDIANNESS is the endianness of the processor
|
|
||||||
case "${ZERO_LIBARCH}" in
|
|
||||||
- i386|amd64|ia64)
|
|
||||||
+ i386|amd64|ia64|arm)
|
|
||||||
ZERO_ENDIANNESS=little
|
|
||||||
;;
|
|
||||||
ppc*|s390*|sparc*|alpha)
|
|
||||||
@@ -307,6 +307,9 @@ if [ "${ZERO_BUILD}" = true ] ; then
|
|
||||||
s390)
|
|
||||||
ZERO_ARCHFLAG="-m31"
|
|
||||||
;;
|
|
||||||
+ arm)
|
|
||||||
+ ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"
|
|
||||||
+ ;;
|
|
||||||
*)
|
|
||||||
ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
|
|
||||||
esac
|
|
@ -1,22 +0,0 @@
|
|||||||
diff -up jdk8/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
|
|
||||||
--- jdk8/jdk/make/common/shared/Sanity.gmk.sav 2012-02-14 16:12:48.000000000 -0500
|
|
||||||
+++ jdk8/jdk/make/common/shared/Sanity.gmk 2012-03-07 17:31:26.153840755 -0500
|
|
||||||
@@ -814,12 +814,12 @@ ifdef OPENJDK
|
|
||||||
@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
|
|
||||||
$(ECHO) "Failed to build freetypecheck." ) > $@
|
|
||||||
|
|
||||||
- sane-freetype: $(TEMPDIR)/freetypeinfo
|
|
||||||
- @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
|
|
||||||
- $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
|
|
||||||
- " or higher is required. \n" \
|
|
||||||
- "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
|
|
||||||
- fi
|
|
||||||
+# sane-freetype: $(TEMPDIR)/freetypeinfo
|
|
||||||
+# @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
|
|
||||||
+# $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
|
|
||||||
+# " or higher is required. \n" \
|
|
||||||
+# "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
|
|
||||||
+# fi
|
|
||||||
else
|
|
||||||
#do nothing (cross-compiling)
|
|
||||||
sane-freetype:
|
|
@ -1,15 +0,0 @@
|
|||||||
diff -up jdk8/corba/make/common/shared/Defs-java.gmk.ppc openjdk/corba/make/common/shared/Defs-java.gmk
|
|
||||||
--- jdk8/corba/make/common/shared/Defs-java.gmk.ppc 2012-03-24 11:44:34.450072733 +0100
|
|
||||||
+++ jdk8/corba/make/common/shared/Defs-java.gmk 2012-03-24 11:44:53.300073137 +0100
|
|
||||||
@@ -79,9 +79,9 @@ JAVAC_JVM_FLAGS =
|
|
||||||
|
|
||||||
# 64-bit builds require a larger thread stack size.
|
|
||||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
|
||||||
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
|
|
||||||
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
|
|
||||||
else
|
|
||||||
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
|
|
||||||
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
|
|
||||||
endif
|
|
||||||
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
--- jdk8/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
|
|
||||||
+++ jdk8/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
|
|
||||||
@@ -83,9 +83,9 @@
|
|
||||||
|
|
||||||
# 64-bit builds require a larger thread stack size.
|
|
||||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
|
||||||
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
|
|
||||||
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
|
|
||||||
else
|
|
||||||
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
|
|
||||||
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
|
|
||||||
endif
|
|
||||||
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
|
|
||||||
|
|
@ -196,16 +196,10 @@ Patch100: rhino.patch
|
|||||||
Patch101: %{name}-bitmap.patch
|
Patch101: %{name}-bitmap.patch
|
||||||
Patch102: %{name}-size_t.patch
|
Patch102: %{name}-size_t.patch
|
||||||
|
|
||||||
# Patches for Arm
|
|
||||||
Patch103: %{name}-arm-fixes.patch
|
|
||||||
|
|
||||||
# Patch for PPC/PPC64
|
# Patch for PPC/PPC64
|
||||||
Patch104: %{name}-ppc-zero-jdk.patch
|
Patch103: %{name}-ppc-zero-hotspot.patch
|
||||||
Patch105: %{name}-ppc-zero-hotspot.patch
|
|
||||||
Patch106: %{name}-ppc-zero-corba.patch
|
|
||||||
|
|
||||||
Patch107: %{name}-freetype-check-fix.patch
|
Patch104: disable-werror.patch
|
||||||
Patch109: disable-werror.patch
|
|
||||||
|
|
||||||
Patch200: system-giflib.patch
|
Patch200: system-giflib.patch
|
||||||
Patch201: system-libjpeg.patch
|
Patch201: system-libjpeg.patch
|
||||||
@ -358,7 +352,7 @@ The OpenJDK API documentation.
|
|||||||
cp %{SOURCE2} .
|
cp %{SOURCE2} .
|
||||||
|
|
||||||
# OpenJDK patches
|
# OpenJDK patches
|
||||||
%patch109
|
%patch104
|
||||||
|
|
||||||
# Rhino patch
|
# Rhino patch
|
||||||
%patch100
|
%patch100
|
||||||
@ -381,18 +375,9 @@ sh %{SOURCE12}
|
|||||||
%patch102
|
%patch102
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Arm fixes
|
|
||||||
%ifarch %{arm}
|
|
||||||
%patch103
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%patch107
|
|
||||||
|
|
||||||
%ifarch ppc %{power64}
|
%ifarch ppc %{power64}
|
||||||
# PPC fixes
|
# PPC fixes
|
||||||
%patch104
|
%patch103
|
||||||
%patch105
|
|
||||||
%patch106
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user