diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-06-19 12:22:08 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-06-19 12:27:22 +0000 |
| commit | 1d2483890a52499577f3443d02876fb507db3bee (patch) | |
| tree | c1ce4534d75952b95fb4bf67eba47096574ebd24 | |
| parent | 57f6e7c8080c374a95d46f54b260c30d61e45e7c (diff) | |
| download | aports-1d2483890a52499577f3443d02876fb507db3bee.tar.bz2 aports-1d2483890a52499577f3443d02876fb507db3bee.tar.xz | |
main/strace: fix s390x build
instead of patching the missing variable, provide it via CFLAGS
so it is available in all files
| -rw-r--r-- | main/strace/APKBUILD | 16 | ||||
| -rw-r--r-- | main/strace/s390x-signal-framesize.patch | 17 |
2 files changed, 13 insertions, 20 deletions
diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD index 913f8d154a..575c212ad0 100644 --- a/main/strace/APKBUILD +++ b/main/strace/APKBUILD @@ -11,7 +11,7 @@ makedepends="linux-headers" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz fix-ppc-pt-regs-collision.patch - s390x-signal-framesize.patch" + " builddir="$srcdir/$pkgname-$pkgver" prepare() { @@ -26,6 +26,17 @@ build() { musl) export CFLAGS="$CFLAGS -Dsigcontext_struct=sigcontext" ;; esac + case "$CARCH" in + s390x) + # __SIGNAL_FRAMESIZE is defined in asm/sigcontext.h + # but including it would make conflict with struct sigcontext + # since we compile with it in musl. + # Temporarily add this until musl upstream has a proper fix + # for struct sigcontext. + export CFLAGS="$CFLAGS -D__SIGNAL_FRAMESIZE=160" + ;; + esac + ac_cv_have_long_long_off_t=yes \ ./configure \ --build=$CBUILD \ @@ -44,5 +55,4 @@ package() { } sha512sums="dab376d9c5ac7db98e864f3cfb165eeec714e3ea492f32ee873cebe01fbd3a0793db09983af1da6530480666a59973ccd9855d348e754be1eead9c0a5d524029 strace-4.17.tar.xz -b70cee89dd49a2b5a69dc2a56c3a11169d3306e1a73981155188b574486965c034aa52b4ac1c6edff5ef55c9d52f27750acb242fac095a8a9f69689b51b3fad1 fix-ppc-pt-regs-collision.patch -37bd35111f902b3785ee006b3e6e3a7b064125c411277c659c5f4e8e7b3c9b4249feaf4616cacff368616beed3414778f0e0e3592a524d890917681004885d6b s390x-signal-framesize.patch" +b70cee89dd49a2b5a69dc2a56c3a11169d3306e1a73981155188b574486965c034aa52b4ac1c6edff5ef55c9d52f27750acb242fac095a8a9f69689b51b3fad1 fix-ppc-pt-regs-collision.patch" diff --git a/main/strace/s390x-signal-framesize.patch b/main/strace/s390x-signal-framesize.patch deleted file mode 100644 index 48a15d61c7..0000000000 --- a/main/strace/s390x-signal-framesize.patch +++ /dev/null @@ -1,17 +0,0 @@ -__SIGNAL_FRAMESIZE is defined in asm/sigcontext.h but including it would make -conflict with struct sigcontext since we compile with it in musl. This patch -is temporary till musl upstream has a proper solution for sigcontext. - -diff --git a/linux/s390/arch_sigreturn.c b/linux/s390/arch_sigreturn.c -index d1b8598..c0a4658 100644 ---- a/linux/s390/arch_sigreturn.c -+++ b/linux/s390/arch_sigreturn.c -@@ -2,7 +2,7 @@ static void - arch_sigreturn(struct tcb *tcp) - { - unsigned long mask[NSIG_BYTES / sizeof(long)]; -- const unsigned long addr = *s390_frame_ptr + __SIGNAL_FRAMESIZE; -+ const unsigned long addr = *s390_frame_ptr + 160; - - if (umove(tcp, addr, &mask) < 0) { - tprintf("{mask=%#lx}", addr); |