nspr-gcc-atomics.patch

@@ -1,8 +1,12 @@
 diff --git a/nspr/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h
-index ad57d08..57877b8 100644
 --- a/nspr/pr/include/md/_linux.h
 +++ b/nspr/pr/include/md/_linux.h
-@@ -105,6 +105,15 @@
+@@ -96,53 +96,73 @@
+ #define NO_DLOPEN_NULL
+ #endif
+ 
+ #if defined(__FreeBSD_kernel__) || defined(__GNU__)
+ #define _PR_HAVE_SOCKADDR_LEN
  #endif
  
  #if defined(__i386__)
@@ -18,7 +22,11 @@ index ad57d08..57877b8 100644
  #define _PR_HAVE_ATOMIC_OPS
  #define _MD_INIT_ATOMIC()
  extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
-@@ -116,6 +125,7 @@ extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_INCREMENT          _PR_x86_AtomicIncrement
+ extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT          _PR_x86_AtomicDecrement
+ extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD                _PR_x86_AtomicAdd
  extern PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
  #define _MD_ATOMIC_SET                _PR_x86_AtomicSet
  #endif
@@ -26,7 +34,15 @@ index ad57d08..57877b8 100644
  
  #if defined(__ia64__)
  #define _PR_HAVE_ATOMIC_OPS
-@@ -131,6 +141,15 @@ extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_ia64_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT          _PR_ia64_AtomicIncrement
+ extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT          _PR_ia64_AtomicDecrement
+ extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD                _PR_ia64_AtomicAdd
+ extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ #define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
  #endif
  
  #if defined(__x86_64__)
@@ -42,14 +58,20 @@ index ad57d08..57877b8 100644
  #define _PR_HAVE_ATOMIC_OPS
  #define _MD_INIT_ATOMIC()
  extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
-@@ -142,6 +161,7 @@ extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_INCREMENT          _PR_x86_64_AtomicIncrement
+ extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT          _PR_x86_64_AtomicDecrement
+ extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
  extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
  #define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
  #endif
 +#endif
  
- #if defined(__loongarch__)
+ #if defined(__or1k__)
  #if defined(__GNUC__)
--- 
+ /* Use GCC built-in functions */
-2.32.1 (Apple Git-133)
+ #define _PR_HAVE_ATOMIC_OPS
-
+ #define _MD_INIT_ATOMIC()
+ #define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
+ #define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)

nspr.spec

@@ -1,12 +1,12 @@
-%global nspr_version 4.35
+%global nspr_version 4.29
 Name:           nspr
-Version:        4.35.0
+Version:        4.29.0
-Release:        3
+Release:        2
 Summary:        Netscape Portable Runtime
 License:        MPLv2.0
 URL:            http://www.mozilla.org/projects/nspr
 BuildRequires:  gcc 
-Source0:        http://ftp.mozilla.org/pub/%{name}/releases/v%{nspr_version}/src/%{name}-%{nspr_version}.tar.gz
+Source0:        https://ftp.mozilla.org/pub/%{name}/releases/v%{nspr_version}/src/%{name}-%{nspr_version}.tar.gz
 Source1:        nspr-config.xml
 
 Patch1:		nspr-gcc-atomics.patch
@@ -35,8 +35,7 @@ cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in
 %configure \
                  --includedir=%{_includedir}/nspr4 \
                  --enable-64bit \
-                 --enable-optimize="$RPM_OPT_FLAGS" \
+                 --enable-optimize="$RPM_OPT_FLAGS"
-                 --disable-debug
 %make_build
 date +"%e %B %Y" | tr -d '\n' > date.xml
 echo -n %{version} > version.xml
@@ -84,21 +83,6 @@ install -c -m 644 nspr-config.1 $RPM_BUILD_ROOT%{_mandir}/man1/nspr-config.1
 %{_mandir}/man*/*
 
 %changelog
-* Tue Apr 23 2024 Liu Chao <liuchao173@huawei.com> - 4.35.0-3
-- update nspr-4.35.tar.gz
-
-* Fri Feb 24 2023 Wenyu Liu <liuwenyu7@huawei.com> - 4.35.0-2
-- disable debug option
-
-* Wed Dec 28 2022 Wenyu Liu <liuwenyu7@huawei.com> - 4.35.0-1
-- update to 4.35.0
-
-* Mon Nov 14 2022 zhaozhen <zhaozhen@loongson.cn> - 4.32.0-2
-- Support loongarch64
-
-* Mon Nov 29 2021 zhouwenpei <zhouwenpei1@huawei.com> - 4.32.0-1
-- update to 4.32.0
-
 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 4.29.0-2
 - DESC: delete -Sgit from %autosetup, and delete BuildRequires git