[packages/Firebird.git] / Firebird-rpath.patch

--- 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
Commit	Line	Data
a4b6cfeb JB	1	--- Firebird-2.1.3.18185-0/builds/posix/make.defaults.orig 2010-08-29 11:10:54.542824134 +0200
	2	+++ Firebird-2.1.3.18185-0/builds/posix/make.defaults 2010-08-29 12:30:20.570823295 +0200
	3	@@ -254,7 +254,7 @@
	4	ifneq ($(IsProdTypeBuild),Y)
	5	UNDEF_FLAGS = $(UNDEF_PLATFORM)
	6	endif
	7	-LINK_OPTS = $(LDFLAGS) $(UNDEF_FLAGS) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/intl
	8	+LINK_OPTS = $(LDFLAGS) $(UNDEF_FLAGS)
	9	LIB_LINK_OPTIONS = $(LDFLAGS) $(UNDEF_FLAGS) -shared
	10
	11	LIB_LINK_RPATH = -Wl,-rpath,
	12	--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.extlib.orig 2007-08-14 13:06:35.000000000 +0200
	13	+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.extlib 2010-08-29 13:57:29.034820781 +0200
	14	@@ -82,7 +82,7 @@ ifeq ($(PLATFORM),DARWIN)
	15	-o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
	16	else
	17	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)ib_udf.$(SHRLIB_EXT) \
	18	-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
	19	+ -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
	20	endif
	21	# ib_util
	22	# this is plain-C library, therefore CLIENTLIB_LINK
	23	@@ -96,7 +96,7 @@ ifeq ($(PLATFORM),DARWIN)
	24	-o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
	25	else
	26	$(CLIENTLIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(IbUtilLibraryName) \
	27	-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
	28	+ -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
	29	endif
	30
	31	include $(ROOT)/gen/make.shared.targets
	32	--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbclient.orig 2007-08-14 13:06:35.000000000 +0200
	33	+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbclient 2010-08-29 13:58:09.594823295 +0200
	34	@@ -116,7 +116,7 @@ $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SO
	35	-o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
	36	else
	37	$(CLIENTLIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \
	38	-$(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib \
	39	+ $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) \
	40	-o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
	41	endif
	42
	43	--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbembed.orig 2007-06-11 16:21:17.000000000 +0200
	44	+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbembed 2010-08-29 13:58:32.394816591 +0200
	45	@@ -68,7 +68,7 @@ $(LIB_EMBED_LINK_OPTIONS) $(LIB_LINK_SON
	46	-o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
	47	else
	48	$(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(SharedLibrarySoName) \
	49	-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
	50	+ -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
	51	endif
	52	$(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO)
	53	(cd $(LIB) && $(LN) -f $(SharedLibraryName) $(SharedLibrarySoName) )
	54	--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.embed.fbudf.orig 2007-03-11 04:52:15.000000000 +0100
	55	+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.embed.fbudf 2010-08-29 19:06:58.122816591 +0200
	56	@@ -74,7 +74,7 @@
	57	-lm -o $@ $^
	58	else
	59	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
	60	-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -lm -o $@ $^
	61	+ -lm -o $@ $^
	62	endif
	63
	64
65	--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.client.fbudf.orig 2007-03-09 11:32:47.000000000 +0100
66	+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.client.fbudf 2010-08-29 19:06:42.678823295 +0200
67	@@ -88,7 +88,7 @@
68	-L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
69	else
70	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
71	-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
72	+ -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
73	endif
74
75
76	--- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.intl.orig 2007-05-11 08:40:19.000000000 +0200
77	+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.intl 2010-08-29 19:04:33.874816591 +0200
78	@@ -89,7 +89,7 @@
79	-o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
80	else
81	$(LIB_LINK) $(LINK_FBINTL_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)libintl.$(SHRLIB_EXT).1 \
82	-$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(ICU_LIBS) $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
83	+ -o $@ $^ -L$(LIB) $(ICU_LIBS) $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
84	endif
85
86	include $(ROOT)/gen/make.shared.targets