Switch apr-util and php pgsql extension dependencies on PostgreSQL 9.3

Alexander Pyhalov

2013-10-24 7fd1f949bff6bf7f020c6f672512b9f1e20e37de

Switch apr-util and php pgsql extension dependencies on PostgreSQL 9.3

 components/apr-util/Makefile

@@ -43,7 +43,7 @@
CONFIGURE_PREFIX=/usr/apr-util

CONFIGURE_OPTIONS +=    --with-mysql=/usr/mariadb/5.5
CONFIGURE_OPTIONS +=    --with-pgsql=/usr/postgres/8.4
CONFIGURE_OPTIONS +=    --with-pgsql=$(PG_HOME)
CONFIGURE_OPTIONS +=    --with-expat=/usr
CONFIGURE_OPTIONS +=    --with-sqlite3=/usr
CONFIGURE_OPTIONS +=    --with-ldap=ldap_r-2.4
@@ -54,7 +54,7 @@
CONFIGURE_OPTIONS.32 +=    --with-apr=/usr/apr/bin/apr-1-config
CONFIGURE_OPTIONS.64 +=    --with-apr=/usr/apr/bin/$(MACH64)/apr-1-config
CONFIGURE_OPTIONS.64 +=    MYSQL_CONFIG=/usr/mariadb/5.5/bin/$(MACH64)/mysql_config
CONFIGURE_OPTIONS.64 +=    PGSQL_CONFIG=/usr/postgres/8.4/bin/$(MACH64)/pg_config
CONFIGURE_OPTIONS.64 +=    PGSQL_CONFIG=$(PG_CONFIG.64)

PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin


 components/apr-util/patches/postgresql_rpath.patch

New file
@@ -0,0 +1,29 @@
--- build/dbd.m4.~1~    2012-08-10 23:51:58.000000000 +0400
+++ build/dbd.m4    2013-10-25 01:01:01.068992520 +0400
@@ -34,7 +34,7 @@
       AC_PATH_PROG([PGSQL_CONFIG],[pg_config])
       if test "x$PGSQL_CONFIG" != 'x'; then
         pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir` -R`$PGSQL_CONFIG --libdir`"
 
         APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
         APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
@@ -71,7 +71,7 @@
       AC_PATH_PROG([PGSQL_CONFIG],[pg_config],,[$withval/bin])
       if test "x$PGSQL_CONFIG" != 'x'; then
         pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir` -R`$PGSQL_CONFIG --libdir`"
       else
         pgsql_CPPFLAGS="-I$withval/include"
         pgsql_LDFLAGS="-L$withval/lib "
@@ -111,7 +111,7 @@
     AC_PATH_PROG([PGSQL_CONFIG],[pg_config])
     if test "x$PGSQL_CONFIG" != 'x'; then
       pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-      pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+      pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir` -R`$PGSQL_CONFIG --libdir`"
 
       APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
       APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])

 components/php-5_4-ext-pgsql/Makefile

@@ -45,8 +45,8 @@
CONFIGURE_OPTIONS.64  +=    --build=x86_64-pc-solaris2.10
CONFIGURE_OPTIONS.32  +=    --with-php-config=$(PHP_PREFIX)/bin/php-config
CONFIGURE_OPTIONS.64  +=    --with-php-config=$(PHP_PREFIX)/bin/$(MACH64)/php-config
CONFIGURE_OPTIONS.32  +=    --with-pgsql=/usr/postgres/8.4/bin/
CONFIGURE_OPTIONS.64  +=    --with-pgsql=/usr/postgres/8.4/bin/$(MACH64)/
CONFIGURE_OPTIONS.32  +=    --with-pgsql=$(PG_BINDIR.32)
CONFIGURE_OPTIONS.64  +=    --with-pgsql=$(PG_BINDIR.64)

CONFIGURE_OPTIONS     +=    $(CONFIGURE_OPTIONS.$(BITS))


 make-rules/ips.mk

@@ -54,6 +54,7 @@
GENERATE_TRANSFORMS +=        $(WS_TOP)/transforms/generate-cleanup

PKGMOGRIFY_TRANSFORMS +=    $(WS_TOP)/transforms/libtool-drop
PKGMOGRIFY_TRANSFORMS +=    $(WS_TOP)/transforms/ignore-libs

COMPARISON_TRANSFORMS +=    $(WS_TOP)/transforms/comparison-cleanup
COMPARISON_TRANSFORMS +=    $(PKGMOGRIFY_TRANSFORMS)

 make-rules/shared-macros.mk

@@ -333,6 +333,23 @@
PKG_MACROS +=   PERL_ARCH=$(PERL_ARCH)
PKG_MACROS +=   PERL_VERSION=$(PERL_VERSION)

PG_VERSION ?=   9.3
PG_VERNUM =     $(subst .,,$(PG_VERSION))
PG_HOME =       /usr/postgres/$(PG_VERSION)
PG_BINDIR.32 =  $(PG_HOME)/bin
PG_BINDIR.64 =  $(PG_HOME)/bin/$(MACH64)
PG_INCDIR =     $(PG_HOME)/include
PG_MANDIR =     $(PG_HOME)/man
PG_SHAREDIR =   $(PG_HOME)/share
PG_DOCDIR =     $(PG_HOME)/doc
PG_LIBDIR.32 =  $(PG_HOME)/lib
PG_LIBDIR.64 =  $(PG_HOME)/lib/$(MACH64)
PG_CONFIG.32 =  $(PG_BINDIR.32)/pg_config
PG_CONFIG.64 =  $(PG_BINDIR.64)/pg_config

PKG_MACROS +=   PG_VERSION=$(PG_VERSION)
PKG_MACROS +=   PG_VERNUM=$(PG_VERNUM)

# This is the default BUILD version of tcl
# Not necessarily the system's default version, i.e. /usr/bin/tclsh
TCL_VERSION =  8.5

 transforms/ignore-libs

New file
@@ -0,0 +1,2 @@
# Don't depend on PostgreSQL compatibility  symbolic link, specify real PG version
<transform file -> add pkg.depend.bypass-generate usr/lib(.*)/libpq.so.*>