aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/postgresql/files/0007-Make-pqsignal-available-to-pg_regress-of-ECPG-and-is.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/postgresql/files/0007-Make-pqsignal-available-to-pg_regress-of-ECPG-and-is.patch')
-rw-r--r--meta-oe/recipes-support/postgresql/files/0007-Make-pqsignal-available-to-pg_regress-of-ECPG-and-is.patch75
1 files changed, 0 insertions, 75 deletions
diff --git a/meta-oe/recipes-support/postgresql/files/0007-Make-pqsignal-available-to-pg_regress-of-ECPG-and-is.patch b/meta-oe/recipes-support/postgresql/files/0007-Make-pqsignal-available-to-pg_regress-of-ECPG-and-is.patch
deleted file mode 100644
index 3cffc0a852..0000000000
--- a/meta-oe/recipes-support/postgresql/files/0007-Make-pqsignal-available-to-pg_regress-of-ECPG-and-is.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 0ae841a98c21c53901d5bc9a9323a8cc800364f6 Mon Sep 17 00:00:00 2001
-From: Noah Misch <noah@leadboat.com>
-Date: Sat, 14 Jun 2014 10:52:25 -0400
-Subject: [PATCH] Make pqsignal() available to pg_regress of ECPG and
- isolation suites.
-
-commit 0ae841a98c21c53901d5bc9a9323a8cc800364f6 REL9_2_STABLE
-
-Commit 453a5d91d49e4d35054f92785d830df4067e10c1 made it available to the
-src/test/regress build of pg_regress, but all pg_regress builds need the
-same treatment. Patch 9.2 through 8.4; in 9.3 and later, pg_regress
-gets pqsignal() via libpgport.
-
-
-Upstream-Status: Backport
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
- src/interfaces/ecpg/test/Makefile | 4 ++--
- src/test/isolation/Makefile | 12 +++++++-----
- 2 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
-index e9944c6..4bb9525 100644
---- a/src/interfaces/ecpg/test/Makefile
-+++ b/src/interfaces/ecpg/test/Makefile
-@@ -47,10 +47,10 @@ clean distclean maintainer-clean:
-
- all: pg_regress$(X)
-
--pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o
-+pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o $(top_builddir)/src/test/regress/pqsignal.o
- $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(LIBS) -o $@
-
--$(top_builddir)/src/test/regress/pg_regress.o:
-+$(top_builddir)/src/test/regress/pg_regress.o $(top_builddir)/src/test/regress/pqsignal.o:
- $(MAKE) -C $(dir $@) $(notdir $@)
-
- # dependencies ensure that path changes propagate
-diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
-index 46ea6f0..e20ba48 100644
---- a/src/test/isolation/Makefile
-+++ b/src/test/isolation/Makefile
-@@ -15,13 +15,15 @@ OBJS = specparse.o isolationtester.o
-
- all: isolationtester$(X) pg_isolation_regress$(X)
-
--submake-regress:
-+pg_regress.o:
- $(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o
--
--pg_regress.o: | submake-regress
- rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o .
-
--pg_isolation_regress$(X): isolation_main.o pg_regress.o
-+pqsignal.o:
-+ $(MAKE) -C $(top_builddir)/src/test/regress pqsignal.o
-+ rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pqsignal.o .
-+
-+pg_isolation_regress$(X): isolation_main.o pg_regress.o pqsignal.o
- $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
-
- isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport
-@@ -59,7 +61,7 @@ endif
- # so do not clean them here
- clean distclean:
- rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o
-- rm -f pg_regress.o
-+ rm -f pg_regress.o pqsignal.o
- rm -rf $(pg_regress_clean_files)
-
- maintainer-clean: distclean
---
-1.7.5.4
-