commit: cb2848291db47c5af91f32c01451ec816e5d292e Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Thu Dec 11 18:54:12 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Thu Dec 11 18:57:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb284829
dev-db/postgresql: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> .../files/postgresql-13.3-riscv-spinlocks.patch | 26 ---- .../files/postgresql-13.8-no-server.patch | 144 --------------------- .../postgresql/files/postgresql-17.6-llvm21.patch | 36 ------ 3 files changed, 206 deletions(-) diff --git a/dev-db/postgresql/files/postgresql-13.3-riscv-spinlocks.patch b/dev-db/postgresql/files/postgresql-13.3-riscv-spinlocks.patch deleted file mode 100644 index 86d1fae20d87..000000000000 --- a/dev-db/postgresql/files/postgresql-13.3-riscv-spinlocks.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/include/storage/s_lock.h -+++ b/src/include/storage/s_lock.h -@@ -315,12 +315,12 @@ - #endif /* __ia64__ || __ia64 */ - - /* -- * On ARM and ARM64, we use __sync_lock_test_and_set(int *, int) if available. -+ * On ARM, ARM64 and RISC-V, we use __sync_lock_test_and_set(int *, int) if available. - * - * We use the int-width variant of the builtin because it works on more chips - * than other widths. - */ --#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) -+#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv) - #ifdef HAVE_GCC__SYNC_INT32_TAS - #define HAS_TEST_AND_SET - -@@ -337,7 +337,7 @@ - #define S_UNLOCK(lock) __sync_lock_release(lock) - - #endif /* HAVE_GCC__SYNC_INT32_TAS */ --#endif /* __arm__ || __arm || __aarch64__ || __aarch64 */ -+#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ - - - /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ diff --git a/dev-db/postgresql/files/postgresql-13.8-no-server.patch b/dev-db/postgresql/files/postgresql-13.8-no-server.patch deleted file mode 100644 index 295df7087c14..000000000000 --- a/dev-db/postgresql/files/postgresql-13.8-no-server.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -5,56 +5,9 @@ - include $(top_builddir)/src/Makefile.global - - SUBDIRS = \ -- adminpack \ -- amcheck \ -- auth_delay \ -- auto_explain \ -- bloom \ -- btree_gin \ -- btree_gist \ -- citext \ -- cube \ -- dblink \ -- dict_int \ -- dict_xsyn \ -- earthdistance \ -- file_fdw \ -- fuzzystrmatch \ -- hstore \ -- intagg \ -- intarray \ -- isn \ -- lo \ -- ltree \ - oid2name \ -- pageinspect \ -- passwordcheck \ -- pg_buffercache \ -- pg_freespacemap \ -- pg_prewarm \ -- pg_standby \ -- pg_stat_statements \ -- pg_trgm \ -- pgcrypto \ -- pgrowlocks \ -- pgstattuple \ -- pg_visibility \ -- postgres_fdw \ -- seg \ -- spi \ -- tablefunc \ -- tcn \ -- test_decoding \ -- tsm_system_rows \ -- tsm_system_time \ -- unaccent \ - vacuumlo - --ifeq ($(with_openssl),yes) --SUBDIRS += sslinfo --else --ALWAYS_SUBDIRS += sslinfo --endif - - ifneq ($(with_uuid),no) - SUBDIRS += uuid-ossp ---- a/src/backend/Makefile -+++ b/src/backend/Makefile -@@ -56,7 +56,7 @@ - - ########################################################################## - --all: submake-libpgport submake-catalog-headers submake-utils-headers postgres $(POSTGRES_IMP) -+all: generated-headers - - ifneq ($(PORTNAME), cygwin) - ifneq ($(PORTNAME), win32) -@@ -195,23 +195,7 @@ - - ########################################################################## - --install: all installdirs install-bin --ifeq ($(PORTNAME), cygwin) --ifeq ($(MAKE_DLL), true) -- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' --endif --endif --ifeq ($(PORTNAME), win32) --ifeq ($(MAKE_DLL), true) -- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' --endif --endif -- $(MAKE) -C catalog install-data -- $(MAKE) -C tsearch install-data -- $(MAKE) -C utils install-data -- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample' -- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample' -- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' -+install: - - ifeq ($(with_llvm), yes) - install-bin: install-postgres-bitcode ---- a/src/bin/Makefile -+++ b/src/bin/Makefile -@@ -14,21 +14,8 @@ - include $(top_builddir)/src/Makefile.global - - SUBDIRS = \ -- initdb \ -- pg_archivecleanup \ -- pg_basebackup \ -- pg_checksums \ - pg_config \ -- pg_controldata \ -- pg_ctl \ - pg_dump \ -- pg_resetwal \ -- pg_rewind \ -- pg_test_fsync \ -- pg_test_timing \ -- pg_upgrade \ -- pg_verifybackup \ -- pg_waldump \ - pgbench \ - psql \ - scripts ---- a/src/Makefile -+++ b/src/Makefile -@@ -15,21 +15,12 @@ - SUBDIRS = \ - common \ - port \ -- timezone \ - backend \ -- backend/utils/mb/conversion_procs \ -- backend/snowball \ - include \ - interfaces \ -- backend/replication/libpqwalreceiver \ -- backend/replication/pgoutput \ - fe_utils \ - bin \ -- pl \ -- makefiles \ -- test/regress \ -- test/isolation \ -- test/perl -+ makefiles - - ifeq ($(with_llvm), yes) - SUBDIRS += backend/jit/llvm diff --git a/dev-db/postgresql/files/postgresql-17.6-llvm21.patch b/dev-db/postgresql/files/postgresql-17.6-llvm21.patch deleted file mode 100644 index 90e32e872be1..000000000000 --- a/dev-db/postgresql/files/postgresql-17.6-llvm21.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 282d0bdee6192f1a859ee34672ae73abf49794dc Mon Sep 17 00:00:00 2001 -From: Peter Eisentraut <[email protected]> -Date: Mon, 15 Sep 2025 08:13:21 +0200 -Subject: [PATCH 1/1] jit: fix build with LLVM-21 -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -LLVM-21 renamed llvm::GlobalValue::getGUID() to -getGUIDAssumingExternalLinkage(), so add a version guard. - -Author: Holger Hoffstätte <[email protected]> -Discussion: https://www.postgresql.org/message-id/flat/d25e6e4a-d1b4-84d3-2f8a-6c45b975f53d%40applied-asynchrony.com ---- - src/backend/jit/llvm/llvmjit_inline.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp -index 2764c3bbe2f..51b32cd9f94 100644 ---- a/src/backend/jit/llvm/llvmjit_inline.cpp -+++ b/src/backend/jit/llvm/llvmjit_inline.cpp -@@ -238,7 +238,11 @@ llvm_build_inline_plan(LLVMContextRef lc, llvm::Module *mod) - - llvm_split_symbol_name(symbolName.data(), &cmodname, &cfuncname); - -+#if LLVM_VERSION_MAJOR >= 21 -+ funcGUID = llvm::GlobalValue::getGUIDAssumingExternalLinkage(cfuncname); -+#else - funcGUID = llvm::GlobalValue::getGUID(cfuncname); -+#endif - - /* already processed */ - if (inlineState.processed) --- -2.39.5 -
