archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-09 00:17:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/java7-openjdk: remove aarch64 patch

Browse source
This commit is contained in:
Kevin Mihelich 2015-10-23 12:37:57 +00:00
parent 1a8b319d13
commit 3a940b5285
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extra/java7-openjdk/PKGBUILD
View file

@ -8,7 +8,6 @@
# - --enable-zero
# - added our architectures to set _JARCH
# - strip -D_FORTIFY_SOURCE=2 from C/CXXFLAGS
# - patch out aarch64 code that fails to build
pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src')
pkgbase=java7-openjdk
@ -40,8 +39,7 @@ source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
fontconfig-paths.diff
openjdk7_nonreparenting-wm.diff
vmstructs.diff)
openjdk7_nonreparenting-wm.diff)
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
@ -54,8 +52,7 @@ sha256sums=('c19eafacd23c81179934acab123511c424cd07c094739fa33778bf7cc80e14d0'
'a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335'
'984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
'4d59e85aa42a52f688e3b80f8c5e0bb06f7dd52327fbbd46ee57fddfa254f335')
'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
icedtea_${_icedtea_ver}_corba.tar.bz2
@ -89,8 +86,7 @@ build() {
cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
patches/openjdk7_nonreparenting-wm.diff \
patches/vmstructs.diff"
patches/openjdk7_nonreparenting-wm.diff"
if [ "$_bootstrap" = "1" ]; then
BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"

13
extra/java7-openjdk/vmstructs.diff
View file

@ -1,13 +0,0 @@
--- openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp.orig 2015-07-21 19:07:36.946010099 -0600
+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp 2015-07-21 19:07:55.625685939 -0600
@@ -843,10 +843,6 @@
/***********************************/ \
\
static_field(StubRoutines, _call_stub_return_address, address) \
- AARCH64_ONLY( \
- static_field(StubRoutines, _updateBytesCRC32, address) \
- static_field(StubRoutines, _crc_table_adr, address) \
- ) \
\
/***************************************/ \
/* PcDesc and other compiled code info */ \