diff options
Diffstat (limited to 'system/nspr')
| -rw-r--r-- | system/nspr/APKBUILD | 13 | ||||
| -rw-r--r-- | system/nspr/fix-getproto.patch | 13 |
2 files changed, 4 insertions, 22 deletions
diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD index 667e2d189..44b067c67 100644 --- a/system/nspr/APKBUILD +++ b/system/nspr/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nspr -pkgver=4.22 +pkgver=4.25 pkgrel=0 pkgdesc="Netscape Portable Runtime" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" @@ -13,7 +13,6 @@ depends_dev="nspr" makedepends="autoconf automake" subpackages="$pkgname-dev" source="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz - fix-getproto.patch stacksize.patch " @@ -23,9 +22,8 @@ prepare() { } build() { - local conf= case "$CARCH" in - *64* | s390x) conf="--enable-64bit";; + *64* | s390x) _conf="--enable-64bit";; esac cd "$builddir"/build # ./nspr/pr/include/md/_linux.h tests only __GLIBC__ version @@ -38,13 +36,11 @@ build() { --disable-debug \ --enable-optimize \ --enable-ipv6 \ - $conf + $_conf make CC="${CC:-gcc}" CXX="${CXX:-g++}" } package() { - local file= - cd "$builddir"/build make DESTDIR="$pkgdir" install @@ -60,6 +56,5 @@ package() { "$pkgdir"/usr/include/nspr/md } -sha512sums="d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b nspr-4.22.tar.gz -ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch +sha512sums="b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562 nspr-4.25.tar.gz 1f694fc151f6578080449e3aa999c520486bbe117b8237150966ec43092db4156e81412ac889045e0c0c3bf65d459af5bdc1cf19c9fa3dab120405a60732f15a stacksize.patch" diff --git a/system/nspr/fix-getproto.patch b/system/nspr/fix-getproto.patch deleted file mode 100644 index a96d14730..000000000 --- a/system/nspr/fix-getproto.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./nspr/pr/src/misc/prnetdb.c.orig -+++ ./nspr/pr/src/misc/prnetdb.c -@@ -61,9 +61,7 @@ - #define _PR_HAVE_GETPROTO_R_POINTER - #endif - --#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \ -- || (defined(LINUX) && defined(_REENTRANT) \ -- && defined(__GLIBC__) && __GLIBC__ < 2) -+#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_GETPROTO_R_POINTER - #endif |