aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorJean-Charles de Longueville <jch@alpine-dev.hellea.net>2015-03-16 17:48:24 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2015-03-16 19:24:57 +0000
commit4837bf1d18e36b44b7e1e66c2bc8a8794a3d1226 (patch)
tree9855a3dda821e0d780e5e8f44d84cae1277b3968 /testing
parentf9341a128f0a6ae6950b33934bd8297fa767541f (diff)
downloadaports-4837bf1d18e36b44b7e1e66c2bc8a8794a3d1226.tar.bz2
aports-4837bf1d18e36b44b7e1e66c2bc8a8794a3d1226.tar.xz
testing/nx-libs: workaround a race condition in build process
Diffstat (limited to 'testing')
-rw-r--r--testing/nx-libs/APKBUILD16
1 files changed, 2 insertions, 14 deletions
diff --git a/testing/nx-libs/APKBUILD b/testing/nx-libs/APKBUILD
index 5311f3f9d6..2acb208b07 100644
--- a/testing/nx-libs/APKBUILD
+++ b/testing/nx-libs/APKBUILD
@@ -26,30 +26,18 @@ prepare() {
done
#Every Makefile has /usr/local as PREFIX, so replace that
- #other files too...
- #find ./ -name Makefile | xargs sed -e 's#/usr/local#/usr#g' -i
- #find ./ -name configure.in | xargs sed -e 's#/usr/local#/usr#g' -i
sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
}
build() {
cd "$_builddir"
-# ./configure \
-# --build=$CBUILD \
-# --host=$CHOST \
-# --prefix=/usr \
-# --sysconfdir=/etc \
-# --mandir=/usr/share/man \
-# --infodir=/usr/share/info \
-# --localstatedir=/var \
-# || return 1
- make PREFIX=/usr USRLIBDIR=/usr/lib SHLIBDIR=/usr/lib CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include" || return 1
+ make -j1 PREFIX=/usr USRLIBDIR=/usr/lib SHLIBDIR=/usr/lib CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include" || return 1
}
package() {
cd "$_builddir"
#find ./ -name Makefile | xargs sed -e 's#/usr/local#/usr#g' -i
- make PREFIX=/usr DESTDIR="$pkgdir" USRLIBDIR=/usr/lib SHLIBDIR=/usr/lib install CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include" || return 1
+ make -j1 PREFIX=/usr DESTDIR="$pkgdir" USRLIBDIR=/usr/lib SHLIBDIR=/usr/lib install CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include" || return 1
rm -f "$pkgdir"/usr/lib/*.la
}