Remove unwanted rpath specification from pgtcl (bz#150649).postgresql-8_0_1-5

2 files changed, 73 insertions, 1 deletions

diff --git a/pgtcl-no-rpath.patch b/pgtcl-no-rpath.patch
new file mode 100644
index 0000000..6f0bd34
--- /dev/null
+++ b/pgtcl-no-rpath.patch
@@ -0,0 +1,63 @@
+This patch removes some bogus stuff from the pgtcl configure script;
+in particular it gets rid of rpath specifications that we don't want
+or need on an RPM platform, as well as long-obsolete optimization
+bypasses.
+
+We also remove some direct hacks on LIBOBJS because modern Autoconf
+doesn't like them; not worth fixing properly since they won't be
+invoked on our systems anyway.
+
+diff -Naur Pgtcl.orig/aclocal.m4 Pgtcl/aclocal.m4
+--- Pgtcl.orig/aclocal.m4	2004-02-15 15:15:37.000000000 -0500
++++ Pgtcl/aclocal.m4	2005-03-11 18:26:44.610459295 -0500
+@@ -293,12 +293,6 @@
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    LDFLAGS=""
+ 
+-	    # AIX v<=4.1 has some different flags than 4.2+
+-	    if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
+-		LIBOBJS="$LIBOBJS tclLoadAix.o"
+-		DL_LIBS="-lld"
+-	    fi
+-
+ 	    # On AIX <=v4 systems, libbsd.a has to be linked in to support
+ 	    # non-blocking file IO.  This library has to be linked in after
+ 	    # the MATH_LIBS or it breaks the pow() function.  The way to
+@@ -490,18 +484,12 @@
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+ 
+-	    # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings 
+-	    # when you inline the string and math operations.  Turn this off to
+-	    # get rid of the warnings.
+-
+-	    CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+-
+ 	    if test "$have_dl" = yes; then
+ 		SHLIB_LD="${CC} -shared"
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+ 		LDFLAGS="-rdynamic"
+-		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR},-rpath,${LIB_PGTCL_RUNTIME_DIR}'
++		LD_SEARCH_FLAGS=""
+ 	    else
+ 		AC_CHECK_HEADER(dld.h, [
+ 		    SHLIB_LD="ld -shared"
+@@ -514,17 +502,6 @@
+ 		EXTRA_CFLAGS="-mieee"
+ 	    fi
+ 
+-	    # The combo of gcc + glibc has a bug related
+-	    # to inlining of functions like strtod(). The
+-	    # -fno-builtin flag should address this problem
+-	    # but it does not work. The -fno-inline flag
+-	    # is kind of overkill but it works.
+-	    # Disable inlining only when one of the
+-	    # files in compat/*.c is being linked in.
+-	    if test x"${LIBOBJS}" != x ; then
+-	        EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
+-	    fi
+-
+ 	    ;;
+ 	GNU*)
+ 	    SHLIB_CFLAGS="-fPIC"
diff --git a/postgresql.spec b/postgresql.spec
index d423117..515a931 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Version: 8.0.1
 # Pre-release RPM's should not be put up on the public ftp.postgresql.org server
 # -- only test releases or full releases should be.
 
-Release: 4
+Release: 5
 License: BSD
 Group: Applications/Databases
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -84,6 +84,7 @@ Patch1: rpm-pgsql.patch
 Patch2: postgresql-src-tutorial.patch
 Patch3: postgresql-logging.patch
 Patch4: postgresql-test.patch
+Patch5: pgtcl-no-rpath.patch
 Buildrequires: perl glibc-devel bison flex
 Prereq: /sbin/ldconfig initscripts
 %if %python
@@ -358,6 +359,11 @@ cp -p %{SOURCE17} .
    unzip %{SOURCE20}
    PGTCLDOCDIR=`basename %{SOURCE20} .zip`
    mv $PGTCLDOCDIR Pgtcl-docs
+
+%patch5 -p0
+   pushd Pgtcl
+%aconfver
+   popd
 %endif
 
 %build
@@ -787,6 +793,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Mar 11 2005 Tom Lane <tgl@redhat.com> 8.0.1-5
+- Remove unwanted rpath specification from pgtcl (bz#150649)
+
 * Wed Mar  2 2005 Tom Lane <tgl@redhat.com> 8.0.1-4
 - Attach Obsoletes: declarations for rh-postgresql to subpackages (bz#144435)
 - Make Requires: and Prereq: package linkages specify release not only