From 180cd620d5397fef14cd8934e8b1ab323cbd5fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Jul 2025 10:17:43 +0700 Subject: [PATCH] nspr: update to 4.37. --- srcpkgs/nspr/patches/musl-large-off_t.patch | 34 +++++++++++++++++++++ srcpkgs/nspr/template | 16 ++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/nspr/patches/musl-large-off_t.patch diff --git a/srcpkgs/nspr/patches/musl-large-off_t.patch b/srcpkgs/nspr/patches/musl-large-off_t.patch new file mode 100644 index 00000000000..54fd6c2ab70 --- /dev/null +++ b/srcpkgs/nspr/patches/musl-large-off_t.patch @@ -0,0 +1,34 @@ +diff --git a/nspr/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h +index bfa3677..1cd483e 100644 +--- a/nspr/pr/include/md/_linux.h ++++ b/nspr/pr/include/md/_linux.h +@@ -325,27 +325,24 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv) + #endif /* __arm__ */ + + #define USE_SETJMP +-#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID) + #define _PR_POLL_AVAILABLE +-#endif + #undef _PR_USE_POLL + #define _PR_STAT_HAS_ONLY_ST_ATIME + #if defined(__alpha) || defined(__ia64__) + #define _PR_HAVE_LARGE_OFF_T ++#elif !defined(__GLIBC__) ++#define _PR_HAVE_LARGE_OFF_T + #elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \ + || defined(ANDROID) + #define _PR_HAVE_OFF64_T + #else + #define _PR_NO_LARGE_FILES + #endif +-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \ +- || defined(ANDROID) + #define _PR_INET6 + #define _PR_HAVE_INET_NTOP + #define _PR_HAVE_GETHOSTBYNAME2 + #define _PR_HAVE_GETADDRINFO + #define _PR_INET6_PROBE +-#endif + #ifndef ANDROID + #define _PR_HAVE_SYSV_SEMAPHORES + #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template index 15d17968aaa..78cbc6c9d9c 100644 --- a/srcpkgs/nspr/template +++ b/srcpkgs/nspr/template @@ -1,6 +1,6 @@ # Template file for 'nspr' pkgname=nspr -version=4.36 +version=4.37 revision=1 build_wrksrc=nspr build_style=gnu-configure @@ -11,8 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="MPL-2.0" homepage="http://www.mozilla.org/projects/nspr/" distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz" -checksum=55dec317f1401cd2e5dba844d340b930ab7547f818179a4002bce62e6f1c6895 -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" +checksum=5f9344ed0e31855bd38f88b33c9d9ab94f70ce547ef3213e488d1520f61840fa if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then configure_args+=" --enable-64bit" @@ -26,6 +25,17 @@ if [ "$CROSS_BUILD" ]; then export HOST_LDFLAGS="$LDFLAGS_FOR_BUILD" fi +do_check() { + make -C lib/tests + make -C pr/tests + LD_LIBRARY_PATH=$wrksrc/nspr/dist/bin lib/tests/arena + LD_LIBRARY_PATH=$wrksrc/nspr/dist/bin lib/tests/base64t + LD_LIBRARY_PATH=$wrksrc/nspr/dist/bin lib/tests/getopt + LD_LIBRARY_PATH=$wrksrc/nspr/dist/bin lib/tests/string + cd pr/tests + ./runtests.sh "$wrksrc/nspr/dist" +} + post_install() { sed -i "s|\(-specs=.*hardened-ld\)||g" ${DESTDIR}/usr/bin/nspr-config ln -s nspr.pc ${DESTDIR}/usr/lib/pkgconfig/mozilla-nspr.pc