diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-05-29 15:54:39 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-05-29 15:55:45 +0000 |
| commit | 64bfa6c3e2d61cf866bbcf93259a83f52c567edd (patch) | |
| tree | ec42bb99cdf95edfa8f9729955245673a51f8768 /main | |
| parent | b3afbaf3034623892824e9afdcdbabe17ff60f6b (diff) | |
| download | aports-64bfa6c3e2d61cf866bbcf93259a83f52c567edd.tar.bz2 aports-64bfa6c3e2d61cf866bbcf93259a83f52c567edd.tar.xz | |
main/orc: fix build on ppc64le
https://gitlab.freedesktop.org/gstreamer/orc/issues/19
Diffstat (limited to 'main')
| -rw-r--r-- | main/orc/APKBUILD | 10 | ||||
| -rw-r--r-- | main/orc/orc-0.4.29-ppc64-revert.patch | 73 |
2 files changed, 80 insertions, 3 deletions
diff --git a/main/orc/APKBUILD b/main/orc/APKBUILD index d75417243d..cf1446cada 100644 --- a/main/orc/APKBUILD +++ b/main/orc/APKBUILD @@ -8,9 +8,11 @@ pkgdesc="The Oil Run-time Compiler" url="https://gstreamer.freedesktop.org/modules/orc.html" arch="all" license="BSD-2-Clause" -makedepends="linux-headers" +makedepends="linux-headers autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc $pkgname-compiler" -source="https://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.xz" +source="https://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.xz + orc-0.4.29-ppc64-revert.patch + " case "$CARCH" in # FIXME: Test exec_opcodes_sys fails on armhf. @@ -20,6 +22,7 @@ esac build() { cd "$builddir" + autoreconf -vif ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -53,4 +56,5 @@ compiler() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="57aa75bbefa9ba9ffcce97affd504c13c57612e2409863c011555bed6ff6ba224d38ed66b715bf103679a8ee28ddae427db3d78c7b4a2ddfa7dbd72a4fa81726 orc-0.4.29.tar.xz" +sha512sums="57aa75bbefa9ba9ffcce97affd504c13c57612e2409863c011555bed6ff6ba224d38ed66b715bf103679a8ee28ddae427db3d78c7b4a2ddfa7dbd72a4fa81726 orc-0.4.29.tar.xz +15b32aa0456f5a3ffc2073e96d870095707c364c5da682ee2701c0d6c5af6f06ed96c5ba919e510731c2690e476b1e8754c6e0a1f88e36a75378e44654d86358 orc-0.4.29-ppc64-revert.patch" diff --git a/main/orc/orc-0.4.29-ppc64-revert.patch b/main/orc/orc-0.4.29-ppc64-revert.patch new file mode 100644 index 0000000000..30a45023d6 --- /dev/null +++ b/main/orc/orc-0.4.29-ppc64-revert.patch @@ -0,0 +1,73 @@ +From b02d7e797a9d66fe22c131526b46524171675319 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz> +Date: Fri, 10 May 2019 12:55:06 +0200 +Subject: [PATCH 1/2] Revert "PowerPC: Support ELFv2 ABI" + +This reverts commit 4e080ed8d64e73465ffe9f79d95b56ff184cf01a. +--- + orc/orcpowerpc.c | 2 +- + orc/orcprogram-altivec.c | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/orc/orcpowerpc.c b/orc/orcpowerpc.c +index 8eeb4e5..a6835ba 100644 +--- a/orc/orcpowerpc.c ++++ b/orc/orcpowerpc.c +@@ -418,7 +418,7 @@ orc_powerpc_flush_cache (OrcCode *code) + int size = code->code_size; + + ptr = code->code; +-#if defined(__powerpc64__) && (!defined(_CALL_ELF) || _CALL_ELF == 1) ++#ifdef __powerpc64__ + *(unsigned char **) ptr = (unsigned char *) code->exec + 24; + #endif + for (i=0;i<size;i+=cache_line_size) { +diff --git a/orc/orcprogram-altivec.c b/orc/orcprogram-altivec.c +index bc40633..2ad11e8 100644 +--- a/orc/orcprogram-altivec.c ++++ b/orc/orcprogram-altivec.c +@@ -27,14 +27,12 @@ powerpc_emit_prologue (OrcCompiler *compiler) + ORC_ASM_CODE (compiler, "%s:\n", compiler->program->name); + + if (compiler->is_64bit) { +-#if !defined(_CALL_ELF) || _CALL_ELF == 1 + ORC_ASM_CODE (compiler, " .quad .%s,.TOC.@tocbase,0\n", + compiler->program->name); + ORC_ASM_CODE (compiler, ".%s:\n", compiler->program->name); + powerpc_emit (compiler, 0); powerpc_emit (compiler, 0); + powerpc_emit (compiler, 0); powerpc_emit (compiler, 0); + powerpc_emit (compiler, 0); powerpc_emit (compiler, 0); +-#endif + powerpc_emit_stdu (compiler, POWERPC_R1, POWERPC_R1, -16); + } else { + powerpc_emit_stwu (compiler, POWERPC_R1, POWERPC_R1, -16); +-- +2.21.0 + + +From e51942caa119b27693ca9aad8b5c2780d10ccb32 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz> +Date: Fri, 10 May 2019 12:57:52 +0200 +Subject: [PATCH 2/2] Revert "Add support for ppc64le" + +This reverts commit 7e504fa1367b15c12807da1053a51db528f37c79. +--- + m4/as-host-defines.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/as-host-defines.m4 b/m4/as-host-defines.m4 +index 4a6ae45..7223c51 100644 +--- a/m4/as-host-defines.m4 ++++ b/m4/as-host-defines.m4 +@@ -19,7 +19,7 @@ AC_DEFUN([AS_HOST_DEFINES], + HAVE_AMD64=yes + AC_DEFINE(HAVE_AMD64, 1, [Defined if host is amd64]) + ;; +- xpowerpc|xppc|xpowerpc64*|xppc64*) ++ xpowerpc|xppc|xpowerpc64|xppc64) + HAVE_POWERPC=yes + AC_DEFINE(HAVE_POWERPC, 1, [Defined if host is powerpc]) + ;; +-- +2.21.0 + |