| 1 |
commit: 41709353b0082a035bd5ac773cc7b30eb9d51f68 |
| 2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 09:09:01 2016 +0000 |
| 4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 09:10:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41709353 |
| 7 |
|
| 8 |
sys-process/criu: revert to ARCH=aarch64 |
| 9 |
|
| 10 |
upstream try to parse ARCH=arm64, but internally still using ARCH=aarch64 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0_rc1 |
| 13 |
|
| 14 |
sys-process/criu/criu-2.3.ebuild | 2 ++ |
| 15 |
sys-process/criu/files/2.3/criu-2.3-aarch64.patch | 22 ++++++++++++++++++++++ |
| 16 |
2 files changed, 24 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-process/criu/criu-2.3.ebuild b/sys-process/criu/criu-2.3.ebuild |
| 19 |
index d67ab07..faf66ed 100644 |
| 20 |
--- a/sys-process/criu/criu-2.3.ebuild |
| 21 |
+++ b/sys-process/criu/criu-2.3.ebuild |
| 22 |
@@ -41,12 +41,14 @@ PATCHES=( |
| 23 |
"${FILESDIR}"/${PV}/${P}-no-git.patch |
| 24 |
"${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch |
| 25 |
"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch |
| 26 |
+ "${FILESDIR}"/${PV}/${P}-aarch64.patch |
| 27 |
) |
| 28 |
|
| 29 |
criu_arch() { |
| 30 |
# criu infers the arch from $(uname -m). We never want this to happen. |
| 31 |
case ${ARCH} in |
| 32 |
amd64) echo "x86";; |
| 33 |
+ arm64) echo "aarch64";; |
| 34 |
*) echo "${ARCH}";; |
| 35 |
esac |
| 36 |
} |
| 37 |
|
| 38 |
diff --git a/sys-process/criu/files/2.3/criu-2.3-aarch64.patch b/sys-process/criu/files/2.3/criu-2.3-aarch64.patch |
| 39 |
new file mode 100644 |
| 40 |
index 0000000..e857b6a |
| 41 |
--- /dev/null |
| 42 |
+++ b/sys-process/criu/files/2.3/criu-2.3-aarch64.patch |
| 43 |
@@ -0,0 +1,22 @@ |
| 44 |
+diff --git a/Makefile b/Makefile |
| 45 |
+index 0e2636b..ef8f78b 100644 |
| 46 |
+--- a/Makefile |
| 47 |
++++ b/Makefile |
| 48 |
+@@ -25,7 +25,7 @@ export SRC_DIR |
| 49 |
+ |
| 50 |
+ # |
| 51 |
+ # Architecture specific options. |
| 52 |
+-ifneq ($(filter-out x86 arm arm64 ppc64,$(ARCH)),) |
| 53 |
++ifneq ($(filter-out x86 arm aarch64 ppc64,$(ARCH)),) |
| 54 |
+ $(error "The architecture $(ARCH) isn't supported") |
| 55 |
+ endif |
| 56 |
+ |
| 57 |
+@@ -39,7 +39,7 @@ ifeq ($(ARCH),arm) |
| 58 |
+ SRCARCH := arm |
| 59 |
+ endif |
| 60 |
+ |
| 61 |
+-ifeq ($(ARCH),arm64) |
| 62 |
++ifeq ($(ARCH),aarch64) |
| 63 |
+ ARCH := aarch64 |
| 64 |
+ SRCARCH := aarch64 |
| 65 |
+ VDSO := y |
Archives