|
|
@ -6,13 +6,13 @@ rhbz#1618698 change, rather provide pg_server_config binary, which int urn means |
|
|
|
that we'll have to fix only a minimal set of packages which really build |
|
|
|
that we'll have to fix only a minimal set of packages which really build |
|
|
|
PostgreSQL server modules. |
|
|
|
PostgreSQL server modules. |
|
|
|
|
|
|
|
|
|
|
|
diff -ur postgresql-14rc1/src/bin/pg_config/Makefile pgsql14/src/bin/pg_config/Makefile |
|
|
|
diff -ur postgresql-16beta1/src/bin/pg_config/Makefile postgresql16_pg_config_patch/src/bin/pg_config/Makefile |
|
|
|
--- postgresql-14rc1/src/bin/pg_config/Makefile 2021-09-20 23:33:01.000000000 +0200 |
|
|
|
--- postgresql-16beta1/src/bin/pg_config/Makefile 2023-05-22 23:08:08.000000000 +0200 |
|
|
|
+++ pgsql14/src/bin/pg_config/Makefile 2021-09-22 10:48:06.484093152 +0200 |
|
|
|
+++ postgresql16_pg_config_patch/src/bin/pg_config/Makefile 2023-06-05 13:51:30.000000000 +0200 |
|
|
|
@@ -11,6 +11,8 @@ |
|
|
|
@@ -11,6 +11,8 @@ |
|
|
|
PGFILEDESC = "pg_config - report configuration information" |
|
|
|
PGFILEDESC = "pg_config - report configuration information" |
|
|
|
PGAPPICON=win32 |
|
|
|
PGAPPICON=win32 |
|
|
|
|
|
|
|
|
|
|
|
+PG_CONFIG = pg_server_config$(X) |
|
|
|
+PG_CONFIG = pg_server_config$(X) |
|
|
|
+ |
|
|
|
+ |
|
|
|
subdir = src/bin/pg_config |
|
|
|
subdir = src/bin/pg_config |
|
|
@ -21,38 +21,37 @@ diff -ur postgresql-14rc1/src/bin/pg_config/Makefile pgsql14/src/bin/pg_config/M |
|
|
|
@@ -19,22 +21,22 @@ |
|
|
|
@@ -19,22 +21,22 @@ |
|
|
|
$(WIN32RES) \ |
|
|
|
$(WIN32RES) \ |
|
|
|
pg_config.o |
|
|
|
pg_config.o |
|
|
|
|
|
|
|
|
|
|
|
-all: pg_config |
|
|
|
-all: pg_config |
|
|
|
+all: $(PG_CONFIG) |
|
|
|
+all: $(PG_CONFIG) |
|
|
|
|
|
|
|
|
|
|
|
-pg_config: $(OBJS) | submake-libpgport |
|
|
|
-pg_config: $(OBJS) | submake-libpgport |
|
|
|
- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) |
|
|
|
- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) |
|
|
|
+$(PG_CONFIG): $(OBJS) | submake-libpgport |
|
|
|
+$(PG_CONFIG): $(OBJS) | submake-libpgport |
|
|
|
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ |
|
|
|
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ |
|
|
|
|
|
|
|
|
|
|
|
install: all installdirs |
|
|
|
install: all installdirs |
|
|
|
- $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)' |
|
|
|
- $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)' |
|
|
|
+ $(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)' |
|
|
|
+ $(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)' |
|
|
|
|
|
|
|
|
|
|
|
installdirs: |
|
|
|
installdirs: |
|
|
|
$(MKDIR_P) '$(DESTDIR)$(bindir)' |
|
|
|
$(MKDIR_P) '$(DESTDIR)$(bindir)' |
|
|
|
|
|
|
|
|
|
|
|
uninstall: |
|
|
|
uninstall: |
|
|
|
- rm -f '$(DESTDIR)$(bindir)/pg_config$(X)' |
|
|
|
- rm -f '$(DESTDIR)$(bindir)/pg_config$(X)' |
|
|
|
+ rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)' |
|
|
|
+ rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)' |
|
|
|
|
|
|
|
|
|
|
|
clean distclean maintainer-clean: |
|
|
|
clean distclean maintainer-clean: |
|
|
|
- rm -f pg_config$(X) $(OBJS) |
|
|
|
- rm -f pg_config$(X) $(OBJS) |
|
|
|
+ rm -f $(PG_CONFIG) $(OBJS) |
|
|
|
+ rm -f $(PG_CONFIG) $(OBJS) |
|
|
|
rm -rf tmp_check |
|
|
|
rm -rf tmp_check |
|
|
|
|
|
|
|
|
|
|
|
check: |
|
|
|
check: |
|
|
|
diff -ur postgresql-15.0_original/src/bin/pg_config/nls.mk postgresql-15.0/src/bin/pg_config/nls.mk |
|
|
|
diff -ur postgresql-16beta1/src/bin/pg_config/nls.mk postgresql16_pg_config_patch/src/bin/pg_config/nls.mk |
|
|
|
--- postgresql-15.0_original/src/bin/pg_config/nls.mk 2022-09-05 23:12:45.000000000 +0200 |
|
|
|
--- postgresql-16beta1/src/bin/pg_config/nls.mk 2023-05-22 23:08:08.000000000 +0200 |
|
|
|
+++ postgresql-15.0/src/bin/pg_config/nls.mk 2022-09-27 17:04:14.618932977 +0200 |
|
|
|
+++ postgresql16_pg_config_patch/src/bin/pg_config/nls.mk 2023-06-05 13:49:37.000000000 +0200 |
|
|
|
@@ -1,4 +1,4 @@ |
|
|
|
@@ -1,3 +1,3 @@ |
|
|
|
# src/bin/pg_config/nls.mk |
|
|
|
# src/bin/pg_config/nls.mk |
|
|
|
-CATALOG_NAME = pg_config |
|
|
|
-CATALOG_NAME = pg_config |
|
|
|
+CATALOG_NAME = pg_server_config |
|
|
|
+CATALOG_NAME = pg_server_config |
|
|
|
AVAIL_LANGUAGES = cs de el es fr he it ja ka ko pl pt_BR ru sv tr uk vi zh_CN |
|
|
|
|
|
|
|
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c |
|
|
|
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c |
|
|
|