From 70a37c44203520cc602402cbdcd1440d1771c039 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 25 Jun 2015 13:19:35 -0700 Subject: [PATCH 1/3] app-emulation/xenstore: Updates for arm64 Signed-off-by: Geoff Levand --- .../app-emulation/xenstore/xenstore-4.4.0-r1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0-r1.ebuild index 90b67a099d..e7f956b92a 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0-r1.ebuild @@ -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 From e17269de896bd9c94e46ffb8c860d30ae0f768db Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 25 Jun 2015 13:19:35 -0700 Subject: [PATCH 2/3] dev-lang/python-oem: Fix arm64 build Signed-off-by: Geoff Levand --- .../files/python-2.7-aarch64-fix.patch | 19 +++++++++++++++++++ ...6-r1.ebuild => python-oem-2.7.6-r2.ebuild} | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/files/python-2.7-aarch64-fix.patch rename sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/{python-oem-2.7.6-r1.ebuild => python-oem-2.7.6-r2.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/files/python-2.7-aarch64-fix.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/files/python-2.7-aarch64-fix.patch new file mode 100644 index 0000000000..a5cc635554 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/files/python-2.7-aarch64-fix.patch @@ -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 + +--- 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'], diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r2.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r2.ebuild index 5778b15d3e..5b379288c6 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r2.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 \ From cd56ab89cec1d3042dccfa487b5daffdb1a4a610 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 25 Jun 2015 13:19:35 -0700 Subject: [PATCH 3/3] dev-lang/python-oem: Change keyword ~arm64 to arm64 Signed-off-by: Geoff Levand --- .../dev-lang/python-oem/python-oem-2.7.6-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r2.ebuild index 5b379288c6..c354756aaa 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r2.ebuild @@ -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.