packages/postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!101 [sync] PR-99: fix sw_64 patch error and remove --no-discard-stderr

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2023-09-27 02:45:36 +00:00 committed by Gitee
commit 1097247eeb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
postgresql-13.3-sw.patch
View File

@ -10,18 +10,6 @@ diff -Naur postgresql-13.3.org/contrib/pgcrypto/crypt-blowfish.c postgresql-13.3
#define BF_ASM 0 #define BF_ASM 0
#define BF_SCALE 1 #define BF_SCALE 1
#else #else
diff -Naur postgresql-13.3.org/postgresql-setup-8.5/Makefile.in postgresql-13.3.sw/postgresql-setup-8.5/Makefile.in
--- postgresql-13.3.org/postgresql-setup-8.5/Makefile.in 2022-09-16 11:31:14.930000000 +0800
+++ postgresql-13.3.sw/postgresql-setup-8.5/Makefile.in 2022-09-16 11:37:09.260000000 +0800
@@ -459,7 +459,7 @@
newunit = sbin/$(NAME_BINARYBASE)-new-systemd-unit
newunit_in = sbin/new-systemd-unit.in
@WANT_SYSVINIT_FALSE@sbin_SCRIPTS = $(newunit)
-HELP2MAN = $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run help2man
+HELP2MAN = $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run help2man --no-discard-stderr
# The help2man call
# =================
diff -Naur postgresql-13.3.org/src/include/port/atomics/arch-sw_64.h postgresql-13.3.sw/src/include/port/atomics/arch-sw_64.h diff -Naur postgresql-13.3.org/src/include/port/atomics/arch-sw_64.h postgresql-13.3.sw/src/include/port/atomics/arch-sw_64.h
--- postgresql-13.3.org/src/include/port/atomics/arch-sw_64.h 1970-01-01 08:00:00.000000000 +0800 --- postgresql-13.3.org/src/include/port/atomics/arch-sw_64.h 1970-01-01 08:00:00.000000000 +0800
+++ postgresql-13.3.sw/src/include/port/atomics/arch-sw_64.h 2022-09-16 13:37:10.630000000 +0800 +++ postgresql-13.3.sw/src/include/port/atomics/arch-sw_64.h 2022-09-16 13:37:10.630000000 +0800
@ -59,7 +47,7 @@ diff -Naur postgresql-13.3.org/src/include/port/atomics.h postgresql-13.3.sw/src
#include "port/atomics/arch-arm.h" #include "port/atomics/arch-arm.h"
#elif defined(__i386__) || defined(__i386) || defined(__x86_64__) #elif defined(__i386__) || defined(__i386) || defined(__x86_64__)
#include "port/atomics/arch-x86.h" #include "port/atomics/arch-x86.h"
+#elif defined(__sw_646__) +#elif defined(__sw_64__)
+#include "port/atomics/arch-sw_64.h" +#include "port/atomics/arch-sw_64.h"
#elif defined(__ia64__) || defined(__ia64) #elif defined(__ia64__) || defined(__ia64)
#include "port/atomics/arch-ia64.h" #include "port/atomics/arch-ia64.h"

5
postgresql.spec
View File

@ -36,7 +36,7 @@ Summary: PostgreSQL client programs
Name: postgresql Name: postgresql
%global majorversion 13 %global majorversion 13
Version: %{majorversion}.12 Version: %{majorversion}.12
Release: 1 Release: 2
# The PostgreSQL license is very similar to other MIT licenses, but the OSI # The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well. # recognizes it as an independent license, so we do as well.
@ -1301,6 +1301,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog %changelog
* Thu Aug 17 2023 panchenbo <panchenbo@kylinsec.com.cn> - 13.12-2
- fix sw_64 patch error and remove --no-discard-stderr
* Fri Aug 11 2023 Funda Wang <fundawang@yeah.net> - 13.12-1 * Fri Aug 11 2023 Funda Wang <fundawang@yeah.net> - 13.12-1
- New version 13.12 - New version 13.12