From e6cf0d065a2eee59886bdd1f2dfca84eccbfc014 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Tue, 9 Sep 2014 17:40:54 +0200 Subject: [PATCH] lib32-jack2: fix 32-bit build Closes #41788 --- lib32-jack2/repos/multilib-x86_64/PKGBUILD | 11 ++--------- lib32-jack2/trunk/PKGBUILD | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/lib32-jack2/repos/multilib-x86_64/PKGBUILD b/lib32-jack2/repos/multilib-x86_64/PKGBUILD index 4c877d4..d1796d6 100644 --- a/lib32-jack2/repos/multilib-x86_64/PKGBUILD +++ b/lib32-jack2/repos/multilib-x86_64/PKGBUILD @@ -28,13 +28,6 @@ md5sums=('4aeb91d7ae0cabce98355436ed4f217a') prepare() { cd "$srcdir/jack-$pkgver" - # ugly dynamic patch to build just the 32 bit jack client lib - # (compatible with previous releases and hoping with the next) - sed -e '/serverlib/,/clientlib/{/clientlib/!d}' \ - -e '/clientlib32bit/i\\tclientlib.posted = True' \ - -e '1,/clientlib32bit/!d' \ - -i common/wscript - # celt and opus are not required to build sed -i 's/, "CELT", "OPUS"//' common/wscript } @@ -45,11 +38,11 @@ build() { --libdir=/usr/lib32 \ --mixed cd common - python2 ../waf build $MAKEFLAGS + python2 ../waf build_lib32 $MAKEFLAGS } package() { - cd "$srcdir/jack-$pkgver/build/common" + cd "$srcdir/jack-$pkgver/build/lib32/common" # jack client 32 bit lib install -Dm755 libjack.so "$pkgdir/usr/lib32/libjack.so.0.1.0" diff --git a/lib32-jack2/trunk/PKGBUILD b/lib32-jack2/trunk/PKGBUILD index 4c877d4..d1796d6 100644 --- a/lib32-jack2/trunk/PKGBUILD +++ b/lib32-jack2/trunk/PKGBUILD @@ -28,13 +28,6 @@ md5sums=('4aeb91d7ae0cabce98355436ed4f217a') prepare() { cd "$srcdir/jack-$pkgver" - # ugly dynamic patch to build just the 32 bit jack client lib - # (compatible with previous releases and hoping with the next) - sed -e '/serverlib/,/clientlib/{/clientlib/!d}' \ - -e '/clientlib32bit/i\\tclientlib.posted = True' \ - -e '1,/clientlib32bit/!d' \ - -i common/wscript - # celt and opus are not required to build sed -i 's/, "CELT", "OPUS"//' common/wscript } @@ -45,11 +38,11 @@ build() { --libdir=/usr/lib32 \ --mixed cd common - python2 ../waf build $MAKEFLAGS + python2 ../waf build_lib32 $MAKEFLAGS } package() { - cd "$srcdir/jack-$pkgver/build/common" + cd "$srcdir/jack-$pkgver/build/lib32/common" # jack client 32 bit lib install -Dm755 libjack.so "$pkgdir/usr/lib32/libjack.so.0.1.0" -- 2.1.0