X-Original-To: alpine-aports@lists.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from smtpout.hellea.net (unknown [89.106.241.193]) by mail.alpinelinux.org (Postfix) with ESMTP id 09334DC00C5 for ; Mon, 16 Mar 2015 16:43:59 +0000 (UTC) Received: from relais.hellea.net (unknown [192.168.1.134]) by smtpout.hellea.net (Postfix) with ESMTP id 1E007413F69F; Mon, 16 Mar 2015 16:43:58 +0000 (GMT) Received: from alpine-dev (unknown [192.168.1.59]) by relais.hellea.net (Postfix) with SMTP id 077D52252BD3F; Mon, 16 Mar 2015 16:43:57 +0000 (GMT) Received: by alpine-dev (sSMTP sendmail emulation); Mon, 16 Mar 2015 17:48:30 +0100 From: "Jean-Charles de Longueville" To: alpine-aports@lists.alpinelinux.org Cc: Jean-Charles de Longueville Subject: [alpine-aports] [PATCH] fix a race condition in build process Date: Mon, 16 Mar 2015 17:48:24 +0100 Message-Id: <1426524504-20358-1-git-send-email-jch@hellea.eu> X-Mailer: git-send-email 2.3.2 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/nx-libs/APKBUILD | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/testing/nx-libs/APKBUILD b/testing/nx-libs/APKBUILD index 5311f3f..4e9653e 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 -j4 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 -j4 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 } -- 2.3.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---