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

extra/java8-openjdk: drop zero patch

Browse source
This commit is contained in:
Kevin Mihelich 2016-04-24 16:27:32 +00:00
parent 7b315ffc12
commit 3147b8086a
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extra/java8-openjdk/PKGBUILD
View file

@ -11,7 +11,6 @@
# - add arm to _JARCH and _DOC_ARCH # - add arm to _JARCH and _DOC_ARCH
# - configure with --with-jvm-variants=zero # - configure with --with-jvm-variants=zero
# - adjust doc package to use linux-${_DOC_ARCH}-normal-zero-release instead of normal-server-release # - adjust doc package to use linux-${_DOC_ARCH}-normal-zero-release instead of normal-server-release
# - patch for zero
buildarch=22 buildarch=22
@ -39,8 +38,7 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
rhbz1206656_fix_current_stack_pointer.patch)
sha256sums=('19bc6028c18dd1993f734dc49991c181138e2e85ead42354d7236fb3c6169e16' sha256sums=('19bc6028c18dd1993f734dc49991c181138e2e85ead42354d7236fb3c6169e16'
'287edac284f4b97f48a14fea331455c3807bcffd51612278decb0ac265303069' '287edac284f4b97f48a14fea331455c3807bcffd51612278decb0ac265303069'
'653821c6d3e542b4922aeedea6e25efb6d3c6ea2aaa0f5b038e6af972accf814' '653821c6d3e542b4922aeedea6e25efb6d3c6ea2aaa0f5b038e6af972accf814'
@ -48,8 +46,7 @@ sha256sums=('19bc6028c18dd1993f734dc49991c181138e2e85ead42354d7236fb3c6169e16'
'77aea5c781d6614b4be391befc59e3017d2d9c9303b6bc2ca9d316cb35954a89' '77aea5c781d6614b4be391befc59e3017d2d9c9303b6bc2ca9d316cb35954a89'
'63eff7fe1f6a0dd7ec0c450724a403dcff986e026b5b9ae9ac46edc7222f798c' '63eff7fe1f6a0dd7ec0c450724a403dcff986e026b5b9ae9ac46edc7222f798c'
'374d12d1434172c775f0ecd944d0a903cd56264a4c9d5ef0be038715e47e67fd' '374d12d1434172c775f0ecd944d0a903cd56264a4c9d5ef0be038715e47e67fd'
'76a18e240a8498c8d2a3a261b7845c8062dbf85941425adcd96f9e879141b3e6' '76a18e240a8498c8d2a3a261b7845c8062dbf85941425adcd96f9e879141b3e6')
'85d396e1663514390e73b0b072a5f93c51ca6e324ee0a08aa2ace599e3df83bf')
case "${CARCH}" in case "${CARCH}" in
'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@ -73,9 +70,6 @@ prepare() {
do do
ln -s ../${subrepo}-${_repo_ver} ${subrepo} ln -s ../${subrepo}-${_repo_ver} ${subrepo}
done done
cd "${srcdir}/hotspot-${_repo_ver}"
patch -p2 -i ../rhbz1206656_fix_current_stack_pointer.patch
} }
build() { build() {

14
extra/java8-openjdk/rhbz1206656_fix_current_stack_pointer.patch
View file

@ -1,14 +0,0 @@
diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -55,8 +55,8 @@
#include "utilities/vmError.hpp"
address os::current_stack_pointer() {
- address dummy = (address) &dummy;
- return dummy;
+ // return the address of the current function
+ return (address)__builtin_frame_address(0);
}
frame os::get_sender_for_C_frame(frame* fr) {