mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-24 16:01:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2049 from glevand/for-merge-arm64-fixes

Browse Source 
Some fixups for arm64.
This commit is contained in:
Geoff Levand 2016-07-07 17:09:46 -07:00 committed by GitHub
commit 0c44365323
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.19.1.ebuild vendored
View File

@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
# NSS is licensed under the MPL, files/certdata2pem.py is GPL # NSS is licensed under the MPL, files/certdata2pem.py is GPL
LICENSE="MPL-2.0 GPL-2" LICENSE="MPL-2.0 GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="amd64" KEYWORDS="amd64 arm64"
IUSE="" IUSE=""
RDEPEND="dev-libs/openssl RDEPEND="dev-libs/openssl

21
sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch vendored Normal file
View File

@ -0,0 +1,21 @@
Fix for CONFIG_ARM64_VA_BITS_48=y
https://bugzilla.redhat.com/show_bug.cgi?id=1242326
--- a/js/src/jsval.h.old
+++ b/js/src/jsval.h
@@ -236,8 +236,14 @@
#elif JS_BITS_PER_WORD == 64
+#if defined(__aarch64__)
+#define JSVAL_PAYLOAD_MASK 0x0000FFFFFFFFFFFFLL
+#define JSVAL_TAG_MASK 0xFFFF000000000000LL
+#else
#define JSVAL_PAYLOAD_MASK 0x00007FFFFFFFFFFFLL
#define JSVAL_TAG_MASK 0xFFFF800000000000LL
+#endif
+
#define JSVAL_TYPE_TO_TAG(type) ((JSValueTag)(JSVAL_TAG_MAX_DOUBLE | (type)))
#define JSVAL_TYPE_TO_SHIFTED_TAG(type) (((uint64)JSVAL_TYPE_TO_TAG(type)) << JSVAL_TAG_SHIFT)

3
sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild vendored
View File

@ -60,6 +60,9 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
# fix builds for alternate $ROOT locations # fix builds for alternate $ROOT locations
epatch "${FILESDIR}"/${P}-no-link-lib-deps.patch epatch "${FILESDIR}"/${P}-no-link-lib-deps.patch
# Fix for CONFIG_ARM64_VA_BITS_48=y
# https://bugzilla.redhat.com/show_bug.cgi?id=1242326
epatch "${FILESDIR}/${P}-fix-arm64-va-48.patch"
epatch_user epatch_user

4
sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords vendored
View File

@ -21,8 +21,6 @@ dev-vcs/git ~arm64
sys-fs/squashfs-tools ~arm64 sys-fs/squashfs-tools ~arm64
net-dns/dnsmasq ~arm64 net-dns/dnsmasq ~arm64
app-emulation/rkt ~amd64
dev-libs/libevent ~arm64 dev-libs/libevent ~arm64
net-misc/ntp ~arm64 net-misc/ntp ~arm64
@ -55,7 +53,6 @@ net-fs/nfs-utils ~arm64
=sys-devel/bison-3.0.4-r1 ~arm64 =sys-devel/bison-3.0.4-r1 ~arm64
=sys-block/thin-provisioning-tools-0.4.1 **
=sys-fs/cryptsetup-1.6.7 ** =sys-fs/cryptsetup-1.6.7 **
=sys-fs/xfsprogs-3.2.2-r1 ** =sys-fs/xfsprogs-3.2.2-r1 **
=sys-apps/i2c-tools-3.1.1-r1 ** =sys-apps/i2c-tools-3.1.1-r1 **
@ -108,4 +105,3 @@ net-fs/nfs-utils ~arm64
# https://bugs.gentoo.org/show_bug.cgi?id=585926 / CVE-2016-4971 # https://bugs.gentoo.org/show_bug.cgi?id=585926 / CVE-2016-4971
=net-misc/wget-1.18 ** =net-misc/wget-1.18 **