mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-21 22:41:09 +02:00
Merge pull request #1312 from glevand/for-merge-4
coreos-overlay: Updates for arm64
This commit is contained in:
commit
00c75ee887
@ -17,7 +17,7 @@ SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm ~x86"
|
||||
KEYWORDS="amd64 ~arm arm64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="${PYTHON_DEPS}"
|
||||
@ -35,6 +35,8 @@ pkg_setup() {
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
elif use arm; then
|
||||
export XEN_TARGET_ARCH="arm32"
|
||||
elif use arm64; then
|
||||
export XEN_TARGET_ARCH="arm64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
|
@ -0,0 +1,19 @@
|
||||
Fixes build errors like these when building for arm64:
|
||||
|
||||
File "build/temp.linux2-aarch64-2.7/libffi/fficonfig.py"
|
||||
ffi_sources += ffi_platforms['AARCH64']
|
||||
KeyError: 'AARCH64'
|
||||
Makefile:475: recipe for target 'sharedmods' failed
|
||||
|
||||
Signed-off-by: Geoff Levand <geoff@infradead.org>
|
||||
|
||||
--- a/Modules/_ctypes/libffi/fficonfig.py.in
|
||||
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
|
||||
@@ -4,6 +4,7 @@
|
||||
""".split()
|
||||
|
||||
ffi_platforms = {
|
||||
+ 'AARCH64': ['src/aarch64/ffi.c', 'src/aarch64/sysv.S'],
|
||||
'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'],
|
||||
'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'],
|
||||
'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'],
|
@ -19,7 +19,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
|
||||
|
||||
LICENSE="PSF-2"
|
||||
SLOT="2.7"
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="hardened"
|
||||
|
||||
# Do not add a dependency on dev-lang/python to this ebuild.
|
||||
@ -50,6 +50,9 @@ src_prepare() {
|
||||
# Fix for linux_distribution()
|
||||
epatch "${FILESDIR}/python-2.7.6-add_os_release_support.patch"
|
||||
|
||||
# Fix for arm64 builds
|
||||
epatch "${FILESDIR}/python-2.7-aarch64-fix.patch"
|
||||
|
||||
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
|
||||
Lib/distutils/command/install.py \
|
||||
Lib/distutils/sysconfig.py \
|
Loading…
x
Reference in New Issue
Block a user