- updated rpath killing (rpath patch)

Changed files:
    Firebird-rpath.patch -> 1.1
    Firebird.spec -> 1.77

diff --git a/Firebird-rpath.patch b/Firebird-rpath.patch
new file mode 100644 (file)
index 0000000..536aecd
--- /dev/null
+++ b/Firebird-rpath.patch
@@ -0,0 +1,86 @@
+--- Firebird-2.1.3.18185-0/builds/posix/make.defaults.orig     2010-08-29 11:10:54.542824134 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/make.defaults  2010-08-29 12:30:20.570823295 +0200
+@@ -254,7 +254,7 @@
+ ifneq ($(IsProdTypeBuild),Y)
+   UNDEF_FLAGS = $(UNDEF_PLATFORM)
+ endif
+-LINK_OPTS = $(LDFLAGS) $(UNDEF_FLAGS) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/intl  
++LINK_OPTS = $(LDFLAGS) $(UNDEF_FLAGS)
+ LIB_LINK_OPTIONS = $(LDFLAGS) $(UNDEF_FLAGS) -shared
+ 
+ LIB_LINK_RPATH = -Wl,-rpath,
+--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.extlib.orig        2007-08-14 13:06:35.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.extlib     2010-08-29 13:57:29.034820781 +0200
+@@ -82,7 +82,7 @@ ifeq ($(PLATFORM),DARWIN)
+ -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ else
+       $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)ib_udf.$(SHRLIB_EXT) \
+-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
++      -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ endif
+ # ib_util
+ # this is plain-C library, therefore CLIENTLIB_LINK 
+@@ -96,7 +96,7 @@ ifeq ($(PLATFORM),DARWIN)
+ -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ else
+       $(CLIENTLIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(IbUtilLibraryName) \
+-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
++      -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ endif
+ 
+ include $(ROOT)/gen/make.shared.targets
+--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbclient.orig   2007-08-14 13:06:35.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbclient        2010-08-29 13:58:09.594823295 +0200
+@@ -116,7 +116,7 @@ $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SO
+ -o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ else
+       $(CLIENTLIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \
+-$(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib \
++      $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) \
+ -o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ endif
+ 
+--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbembed.orig    2007-06-11 16:21:17.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbembed 2010-08-29 13:58:32.394816591 +0200
+@@ -68,7 +68,7 @@ $(LIB_EMBED_LINK_OPTIONS) $(LIB_LINK_SON
+ -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
+ else
+       $(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(SharedLibrarySoName) \
+-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
++      -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
+ endif
+ $(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO)
+       (cd $(LIB) && $(LN) -f $(SharedLibraryName) $(SharedLibrarySoName) )
+--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.embed.fbudf.orig   2007-03-11 04:52:15.000000000 +0100
++++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.embed.fbudf        2010-08-29 19:06:58.122816591 +0200
+@@ -74,7 +74,7 @@
+ -lm -o $@ $^
+ else
+       $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
+-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -lm -o $@ $^
++      -lm -o $@ $^
+ endif
+ 
+ 
+--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.client.fbudf.orig  2007-03-09 11:32:47.000000000 +0100
++++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.client.fbudf       2010-08-29 19:06:42.678823295 +0200
+@@ -88,7 +88,7 @@
+ -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ else
+       $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
+-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
++      -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ endif
+ 
+ 
+--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.intl.orig  2007-05-11 08:40:19.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.intl       2010-08-29 19:04:33.874816591 +0200
+@@ -89,7 +89,7 @@
+ -o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ else
+       $(LIB_LINK) $(LINK_FBINTL_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)libintl.$(SHRLIB_EXT).1 \
+-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(ICU_LIBS) $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
++      -o $@ $^ -L$(LIB) $(ICU_LIBS) $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ endif
+ 
+ include $(ROOT)/gen/make.shared.targets

diff --git a/Firebird.spec b/Firebird.spec
index 4073264fd2aeb29c70f570c408f86d01e16216fa..4c8b0f3011930e7cc8141a55e1f070e7ad88089e 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -50,6 +50,7 @@ Patch5:               %{name}-64bit.patch
 Patch6:                %{name}-gcc-icu.patch
 Patch7:                %{name}-btyacc-segv.patch
 Patch8:                %{name}-opt.patch
+Patch9:                %{name}-rpath.patch
 URL:           http://www.firebirdsql.org/
 BuildRequires: autoconf >= 2.56
 BuildRequires: automake
@@ -169,6 +170,7 @@ Obszerna dokumentacja do baz InterBase i Firebird.
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %{__sed} -i 's,@prefix@,%{_prefix},' builds/install/misc/fb_config.in
 
@@ -180,7 +182,7 @@ cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}
 
 # not processed by configure
 %{__sed} -i -e 's/^CFLAGS.*$/& %{rpmcflags}/' extern/btyacc/Makefile
-%{__sed} -i -e 's/^\(CC.*= \)gcc$/\1 %{__cc}/' extern/btyacc/Makefile
+%{__sed} -i -e 's/^\(CC\|LINKER\)\(.*= \)gcc$/\1\2 %{__cc}/' extern/btyacc/Makefile
 
 %build
 %{__libtoolize}
@@ -197,11 +199,7 @@ cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}
        --prefix=%{ibdir} \
        %{?debug:--enable-debug}
 
-%{__make} -j1 \
-       CC="%{__cc}" \
-       CXX="%{__cxx}" \
-       LIB_LINK_RPATH_LINE= \
-       LIB_CLIENT_LINK_OPTIONS="-lpthread"
+%{__make} -j1
 
 # fb_lock_mgr is started during build - try to stop it (if /proc is mounted...)
 fuser -k gen/firebird/bin/fb_lock_mgr 2>/dev/null || :