pgbuilder_pel7ppc64bebuilder0
6 years ago
5 changed files with 506 additions and 232 deletions
Binary file not shown.
@ -0,0 +1,40 @@
@@ -0,0 +1,40 @@
|
||||
We don't build/install interfaces by upstream's implicit rules. |
||||
|
||||
This patch is used on two places; postgresql.spec and libecpg.spec -- keep those |
||||
in sync! |
||||
|
||||
Related: rhbz#1618698 |
||||
|
||||
diff --git a/src/Makefile b/src/Makefile |
||||
index bcdbd95..4bea236 100644 |
||||
--- a/src/Makefile |
||||
+++ b/src/Makefile |
||||
@@ -20,7 +20,6 @@ SUBDIRS = \ |
||||
backend/utils/mb/conversion_procs \ |
||||
backend/snowball \ |
||||
include \ |
||||
- interfaces \ |
||||
backend/replication/libpqwalreceiver \ |
||||
backend/replication/pgoutput \ |
||||
fe_utils \ |
||||
diff --git a/src/Makefile.global.in b/src/Makefile.global.in |
||||
index 9a4a8a3..2bdfb77 100644 |
||||
--- a/src/Makefile.global.in |
||||
+++ b/src/Makefile.global.in |
||||
@@ -513,7 +513,7 @@ endif |
||||
|
||||
# This macro is for use by libraries linking to libpq. (Because libpgport |
||||
# isn't created with the same link flags as libpq, it can't be used.) |
||||
-libpq = -L$(libpq_builddir) -lpq |
||||
+libpq = -lpq |
||||
|
||||
# This macro is for use by client executables (not libraries) that use libpq. |
||||
# We force clients to pull symbols from the non-shared libraries libpgport |
||||
@@ -539,7 +539,6 @@ endif |
||||
# Commonly used submake targets |
||||
|
||||
submake-libpq: | submake-generated-headers |
||||
- $(MAKE) -C $(libpq_builddir) all |
||||
|
||||
submake-libpgport: | submake-generated-headers |
||||
$(MAKE) -C $(top_builddir)/src/port all |
@ -0,0 +1,59 @@
@@ -0,0 +1,59 @@
|
||||
We should ideally provide '/bin/pg_config' in postgresql-server-devel, and |
||||
provide no pg_config binary in libpq package. But most of the Fedora packages |
||||
that use pg_config actually only build against PG libraries (and |
||||
postgresql-server-devel isn't needed). So.., to avoid the initial rush around |
||||
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 |
||||
PostgreSQL server modules. |
||||
|
||||
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile |
||||
index 02e6f9d..f7c844f 100644 |
||||
--- a/src/bin/pg_config/Makefile |
||||
+++ b/src/bin/pg_config/Makefile |
||||
@@ -11,28 +11,30 @@ |
||||
PGFILEDESC = "pg_config - report configuration information" |
||||
PGAPPICON=win32 |
||||
|
||||
+PG_CONFIG = pg_server_config$(X) |
||||
+ |
||||
subdir = src/bin/pg_config |
||||
top_builddir = ../../.. |
||||
include $(top_builddir)/src/Makefile.global |
||||
|
||||
OBJS= pg_config.o $(WIN32RES) |
||||
|
||||
-all: pg_config |
||||
+all: $(PG_CONFIG) |
||||
|
||||
-pg_config: $(OBJS) | submake-libpgport |
||||
- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) |
||||
+$(PG_CONFIG): $(OBJS) | submake-libpgport |
||||
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ |
||||
|
||||
install: all installdirs |
||||
- $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)' |
||||
+ $(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)' |
||||
|
||||
installdirs: |
||||
$(MKDIR_P) '$(DESTDIR)$(bindir)' |
||||
|
||||
uninstall: |
||||
- rm -f '$(DESTDIR)$(bindir)/pg_config$(X)' |
||||
+ rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)' |
||||
|
||||
clean distclean maintainer-clean: |
||||
- rm -f pg_config$(X) $(OBJS) |
||||
+ rm -f $(PG_CONFIG) $(OBJS) |
||||
rm -rf tmp_check |
||||
|
||||
check: |
||||
diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk |
||||
index 1d41f90..0f34f37 100644 |
||||
--- a/src/bin/pg_config/nls.mk |
||||
+++ b/src/bin/pg_config/nls.mk |
||||
@@ -1,4 +1,4 @@ |
||||
# src/bin/pg_config/nls.mk |
||||
-CATALOG_NAME = pg_config |
||||
+CATALOG_NAME = pg_server_config |
||||
AVAIL_LANGUAGES = cs de es fr he it ja ko nb pl pt_BR ro ru sv ta tr vi zh_CN zh_TW |
||||
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c |
Loading…
Reference in new issue