commit: 507412d6cd7d4cbac93af74e198cb65150646fe9 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> AuthorDate: Fri Sep 27 05:47:07 2024 +0000 Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org> CommitDate: Fri Sep 27 05:53:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=507412d6
dev-db/postgresql: Fix USE=-server Closes: https://bugs.gentoo.org/940319 Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org> .../files/postgresql-17.0-no-server.patch | 146 +++++++++++++++++++++ ...resql-17.0.ebuild => postgresql-17.0-r1.ebuild} | 2 +- 2 files changed, 147 insertions(+), 1 deletion(-) diff --git a/dev-db/postgresql/files/postgresql-17.0-no-server.patch b/dev-db/postgresql/files/postgresql-17.0-no-server.patch new file mode 100644 index 000000000000..a32ca2dbe448 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-17.0-no-server.patch @@ -0,0 +1,146 @@ +--- a/contrib/Makefile ++++ b/contrib/Makefile +@@ -5,57 +5,9 @@ + include $(top_builddir)/src/Makefile.global + + SUBDIRS = \ +- amcheck \ +- auth_delay \ +- auto_explain \ +- basic_archive \ +- basebackup_to_shell \ +- 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_stat_statements \ +- pg_surgery \ +- pg_trgm \ +- pgrowlocks \ +- pgstattuple \ +- pg_visibility \ +- pg_walinspect \ +- postgres_fdw \ +- seg \ +- spi \ +- tablefunc \ +- tcn \ +- test_decoding \ +- tsm_system_rows \ +- tsm_system_time \ +- unaccent \ + vacuumlo + +-ifeq ($(with_ssl),openssl) +-SUBDIRS += pgcrypto sslinfo +-else +-ALWAYS_SUBDIRS += pgcrypto 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) +@@ -194,23 +194,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,24 +14,8 @@ + include $(top_builddir)/src/Makefile.global + + SUBDIRS = \ +- initdb \ +- pg_amcheck \ +- pg_archivecleanup \ +- pg_basebackup \ +- pg_checksums \ +- pg_combinebackup \ + pg_config \ +- pg_controldata \ +- pg_ctl \ + pg_dump \ +- pg_resetwal \ +- pg_rewind \ +- pg_test_fsync \ +- pg_test_timing \ +- pg_upgrade \ +- pg_verifybackup \ +- pg_waldump \ +- pg_walsummary \ + pgbench \ + psql \ + scripts +--- a/src/Makefile ++++ b/src/Makefile +@@ -17,19 +17,11 @@ + 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/postgresql-17.0.ebuild b/dev-db/postgresql/postgresql-17.0-r1.ebuild similarity index 99% rename from dev-db/postgresql/postgresql-17.0.ebuild rename to dev-db/postgresql/postgresql-17.0-r1.ebuild index 733d45e16d00..1ad58bcafb27 100644 --- a/dev-db/postgresql/postgresql-17.0.ebuild +++ b/dev-db/postgresql/postgresql-17.0-r1.ebuild @@ -116,7 +116,7 @@ src_prepare() { # hardened and non-hardened environments. (Bug #528786) sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die - use server || eapply "${FILESDIR}/${PN}-15_beta3-no-server.patch" + use server || eapply "${FILESDIR}/${PN}-17.0-no-server.patch" if use pam ; then sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
