Compare commits

...

11 Commits

Author SHA1 Message Date
openeuler-ci-bot
c3386e9d02
!39 [sync] PR-38: update nspr-4.35.tar.gz
From: @openeuler-sync-bot 
Reviewed-by: @wangbin224 
Signed-off-by: @wangbin224
2024-04-23 07:57:54 +00:00
SuperSix173
d2efb0fbb0 update nspr-4.35.tar.gz
Signed-off-by: SuperSix173 <liuchao173@huawei.com>
(cherry picked from commit 3809832ac6bd9d32e30478910734d4ab5d22eeb3)
2024-04-23 15:15:06 +08:00
openeuler-ci-bot
0fdda4688d
!32 disable debug option
From: @WizardHowl 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
2023-02-24 10:52:45 +00:00
WizardHowl
96e3b8cbfd disable debug option
Signed-off-by: WizardHowl <liuwenyu7@huawei.com>
2023-02-24 17:41:00 +08:00
openeuler-ci-bot
d93674ee67
!31 update to 4.35.0
From: @WizardHowl 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
2022-12-29 01:38:18 +00:00
Wizard Howl
1af36ba6ff update to 4.35.0 2022-12-28 15:39:25 +08:00
openeuler-ci-bot
6657b2b5e5
!26 support loongarch64
From: @zhaozhen-zz 
Reviewed-by: @l30013671, @SuperSix173 
Signed-off-by: @SuperSix173
2022-11-18 07:26:30 +00:00
zhaozhen-zz
9bbf1bef58
update nspr.spec.
Signed-off-by: zhaozhen-zz <zhaozhen@loongson.cn>
2022-11-15 08:37:17 +00:00
zhaozhen
e54cb0d7cf support loongarch64 2022-11-14 14:53:05 +08:00
openeuler-ci-bot
81ecb83fda !18 update verion to 4.32.0
From: @zhouwenpei
Reviewed-by: @liqingqing_1229
Signed-off-by: @liqingqing_1229
2021-11-30 11:41:47 +00:00
zhouwenpei
c0eb15e7a0 update verion to 4.32.0 2021-11-29 17:00:58 +08:00
4 changed files with 30 additions and 36 deletions

Binary file not shown.

BIN
nspr-4.35.tar.gz Normal file

Binary file not shown.

View File

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

View File

@ -1,12 +1,12 @@
%global nspr_version 4.29
%global nspr_version 4.35
Name: nspr
Version: 4.29.0
Release: 2
Version: 4.35.0
Release: 3
Summary: Netscape Portable Runtime
License: MPLv2.0
URL: http://www.mozilla.org/projects/nspr
BuildRequires: gcc
Source0: https://ftp.mozilla.org/pub/%{name}/releases/v%{nspr_version}/src/%{name}-%{nspr_version}.tar.gz
Source0: http://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,7 +35,8 @@ 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
@ -83,6 +84,21 @@ 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