Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=78b8e38632cb98cbb0551cb5ebb5c9051c366769
commit 78b8e38632cb98cbb0551cb5ebb5c9051c366769 Author: DeX77 <[email protected]> Date: Thu Nov 3 17:13:02 2016 +0100 nspr-4.13.1-2-x86_64 + add cross32 diff --git a/source/base/nspr/FrugalBuild b/source/base/nspr/FrugalBuild index 3c4c0e3..cdad336 100644 --- a/source/base/nspr/FrugalBuild +++ b/source/base/nspr/FrugalBuild @@ -3,46 +3,54 @@ pkgname=nspr pkgver=4.13.1 -pkgrel=1 +pkgrel=2 pkgdesc="NSPR library from mozilla.org" url="http://www.mozilla.org/projects/nspr/"; pkgurl="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/"; groups=('base') -archs=('i686' 'x86_64') +archs=('x86_64') license="MPL GPL" depends=('glibc>=2.24-4') up2date="Flastverdir '$pkgurl' | sed 's/v//g' " -source=($pkgurl/v${pkgver}/src/$pkgname-$pkgver.tar.gz nspr.pc) -sha1sums=('ec6660257d41267a0e6ee25812e9012cb9ddd274' \ - '02d0de881bf7e22ad010c22b1fb47204ceb94f32') -_F_cd_path="$pkgname-$pkgver/$pkgname" - -build() -{ - if [ "$CARCH" == "x86_64" ]; then - opts="--enable-64bit" - fi - Fcd - Fconf \ - --libdir=/usr/lib \ +source=($pkgurl/v${pkgver}/src/$pkgname-$pkgver.tar.gz) +sha1sums=('ec6660257d41267a0e6ee25812e9012cb9ddd274') + +_F_conf_configure="./nspr/configure" + +Fconfopts=" --disable-optimize \ + --disable-debug \ + --enable-strip \ + --with-pthreads \ --includedir=/usr/include/nspr4 \ - --disable-optimize \ - --disable-debug \ - --enable-strip \ - --with-pthreads \ - --enable-ipv6 \ - $opts - ## do not use Fmakeinstall here - make || Fdie - make DESTDIR=$Fdestdir install || Fdie - - Fexe /usr/lib/pkgconfig/nspr.pc + --enable-ipv6" +F32confopts=" --libdir=/usr/lib32 \ + --bindir=/usr/i686-frugalware-linux/bin \ + --includedir=/usr/i686-frugalware-linux/include/nspr4" + +_F_cross32_simple_auto="yes" +Finclude cross32 + +build() { + Fcross32_common_build + Fcross32_delete_empty + Frm usr/i686-frugalware-linux/bin/compile-et.pl + Frm usr/i686-frugalware-linux/usr/bin/pterr.* + Frm usr/lib32/*.a + Frm usr/i686-frugalware-linux/nspr4/md + + Fln nspr4 /usr/i686-frugalware-linux/include/nspr + + Fsplit "${subpkgs[0]}" /\* ## everything else ignored only first one + Fbuild ## 64bit + + + Frm usr/bin/compile-et.pl + Frm usr/bin/pterr.* + Frm usr/lib/*.a + Frm usr/share/aclocal + Frm usr/include/nspr4/md + Fln nspr4 /usr/include/nspr - Frm usr/bin/compile-et.pl - Frm usr/bin/pterr.* - Frm usr/lib/*.a - Frm usr/share/aclocal - Frm usr/include/nspr4/md } # optimization OK diff --git a/source/base/nspr/nspr.pc b/source/base/nspr/nspr.pc deleted file mode 100644 index 13782fc..0000000 --- a/source/base/nspr/nspr.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include/nspr4 - -Name: NSPR -Description: The Netscape Portable Runtime -Version: 4.13.1 -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -Cflags: -I${includedir} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
