Updated patch to directly define -lossp-uuid in contrib/uuid/Makefile since Makefile.global installed by postgresql-base defines it as empty (bug #219232)

(Portage version: 2.1.5_rc7)

2 files changed, 28 insertions, 15 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index ffa0dd71141a..98d0e5647cfc 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.4 2008/05/19 07:10:18 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.5 2008/05/20 05:56:46 dev-zero Exp $
+
+  20 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  files/postgresql-8.3-server.patch:
+  Updated patch to directly define -lossp-uuid in contrib/uuid/Makefile
+  since Makefile.global installed by postgresql-base defines it as empty
+  (bug #219232)
 
   19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   postgresql-server-8.3.1.ebuild:
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-server.patch b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
index 6b04efa41610..da1e812e0b3d 100644
--- a/dev-db/postgresql-server/files/postgresql-8.3-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
@@ -1,6 +1,6 @@
 === GNUmakefile.in
 ==================================================================
---- GNUmakefile.in	(revision 12)
+--- GNUmakefile.in	(revision 14)
 +++ GNUmakefile.in	(local)
 @@ -11,19 +11,16 @@
  all:
@@ -24,7 +24,7 @@
  	$(MAKE) -C doc $@
 === contrib/Makefile
 ==================================================================
---- contrib/Makefile	(revision 12)
+--- contrib/Makefile	(revision 14)
 +++ contrib/Makefile	(local)
 @@ -20,22 +20,19 @@
  		isn		\
@@ -52,7 +52,7 @@
  WANTED_DIRS += sslinfo
 === contrib/adminpack/Makefile
 ==================================================================
---- contrib/adminpack/Makefile	(revision 12)
+--- contrib/adminpack/Makefile	(revision 14)
 +++ contrib/adminpack/Makefile	(local)
 @@ -1,7 +1,7 @@
  # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
@@ -65,19 +65,26 @@
  OBJS = adminpack.o
 === contrib/uuid-ossp/Makefile
 ==================================================================
---- contrib/uuid-ossp/Makefile	(revision 12)
+--- contrib/uuid-ossp/Makefile	(revision 14)
 +++ contrib/uuid-ossp/Makefile	(local)
-@@ -1,5 +1,7 @@
+@@ -1,11 +1,13 @@
  # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
  
-+PG_CPPFLAGS="-DHAVE_OSSP_UUID_H"
++PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
 +
  MODULE_big = uuid-ossp
  OBJS = uuid-ossp.o
  DATA_built = uuid-ossp.sql
+ DATA = uninstall_uuid-ossp.sql
+ 
+-SHLIB_LINK += $(OSSP_UUID_LIBS)
++SHLIB_LINK += -lossp-uuid
+ 
+ ifdef USE_PGXS
+ PG_CONFIG = pg_config
 === src/Makefile
 ==================================================================
---- src/Makefile	(revision 12)
+--- src/Makefile	(revision 14)
 +++ src/Makefile	(local)
 @@ -19,14 +19,11 @@
  	$(MAKE) -C backend $@
@@ -97,7 +104,7 @@
  	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
 === src/Makefile.global.in
 ==================================================================
---- src/Makefile.global.in	(revision 12)
+--- src/Makefile.global.in	(revision 14)
 +++ src/Makefile.global.in	(local)
 @@ -373,10 +373,8 @@
  
@@ -122,7 +129,7 @@
  # substitute implementations of C library routines (see src/port/)
 === src/bin/Makefile
 ==================================================================
---- src/bin/Makefile	(revision 12)
+--- src/bin/Makefile	(revision 14)
 +++ src/bin/Makefile	(local)
 @@ -13,8 +13,8 @@
  top_builddir = ../..
@@ -137,7 +144,7 @@
  endif
 === src/bin/initdb/Makefile
 ==================================================================
---- src/bin/initdb/Makefile	(revision 12)
+--- src/bin/initdb/Makefile	(revision 14)
 +++ src/bin/initdb/Makefile	(local)
 @@ -14,7 +14,7 @@
  top_builddir = ../../..
@@ -150,7 +157,7 @@
  
 === src/include/pg_config_manual.h
 ==================================================================
---- src/include/pg_config_manual.h	(revision 12)
+--- src/include/pg_config_manual.h	(revision 14)
 +++ src/include/pg_config_manual.h	(local)
 @@ -184,7 +184,7 @@
   * here's where to twiddle it.  You can also override this at runtime
@@ -163,7 +170,7 @@
   * The random() function is expected to yield values between 0 and
 === src/port/Makefile
 ==================================================================
---- src/port/Makefile	(revision 12)
+--- src/port/Makefile	(revision 14)
 +++ src/port/Makefile	(local)
 @@ -35,11 +35,10 @@
  # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
@@ -181,7 +188,7 @@
  	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
 === src/test/regress/GNUmakefile
 ==================================================================
---- src/test/regress/GNUmakefile	(revision 12)
+--- src/test/regress/GNUmakefile	(revision 14)
 +++ src/test/regress/GNUmakefile	(local)
 @@ -141,7 +141,7 @@
  ##
@@ -194,7 +201,7 @@
  	./pg_regress --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule --srcdir=$(abs_srcdir) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
 === src/test/regress/pg_regress.c
 ==================================================================
---- src/test/regress/pg_regress.c	(revision 12)
+--- src/test/regress/pg_regress.c	(revision 14)
 +++ src/test/regress/pg_regress.c	(local)
 @@ -781,9 +781,6 @@
  		sprintf(tmp, "%s/install/%s", temp_install, datadir);