From cea5a67b30d9715ed9de040df38bd8f2c37365c7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 27 May 2015 08:13:42 +0200 Subject: [PATCH] nspr: unbreak musl cross. --- srcpkgs/nspr/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template index 78e671ab8ae..2b79ad2655d 100644 --- a/srcpkgs/nspr/template +++ b/srcpkgs/nspr/template @@ -1,7 +1,7 @@ # Template file for 'nspr' pkgname=nspr version=4.10.8 -revision=3 +revision=4 build_style=gnu-configure build_wrksrc="nspr" makedepends="zlib-devel" @@ -13,16 +13,16 @@ distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.t checksum=507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15 do_configure() { - CFLAGS+=" -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE" + CFLAGS="$XBPS_CFLAGS -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE" + if [ "$CROSS_BUILD" ]; then - unset CFLAGS _args+=" --target=$XBPS_CROSS_TRIPLET" fi case "$XBPS_TARGET_MACHINE" in x86_64*) _args+=" --enable-64bit";; esac - ./configure --prefix=/usr --libdir=/usr/lib \ + ./configure --build=${XBPS_TRIPLET} --prefix=/usr --libdir=/usr/lib \ --includedir=/usr/include/nspr --enable-optimize \ --enable-debug --enable-ipv6 ${_args} }