--- berkeleydb/makefile.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ berkeleydb/makefile.mk	2012-08-28 19:44:56.000000000 -0400
@@ -89,14 +89,14 @@
 .ENDIF
 
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)$(COM)"=="LINUXGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-z,origin,-rpath,'$$$$ORIGIN'
 .EXPORT: LDFLAGS
 #The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out
 # the map file is in  unxlngi6.pro/misc/build/db-4.2.52.NC
 LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map
 .EXPORT: LDFLAGSVERSION
-.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\'
 .EXPORT: LDFLAGS
--- cairo/cairo/makefile.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ cairo/cairo/makefile.mk	2012-08-28 19:38:00.000000000 -0400
@@ -137,7 +137,7 @@
 .ELSE
 # ----------- Unix ---------------------------------------------------------
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-cairo_LDFLAGS+=-Wl,-rpath,\$$$$ORIGIN:\$$$$ORIGIN/../ure-link/lib -Wl,-z,noexecstack
+cairo_LDFLAGS+=-Wl,-z,origin,-rpath,\$$$$ORIGIN:\$$$$ORIGIN/../ure-link/lib -Wl,-z,noexecstack
 .ELIF "$(OS)$(COM)"=="SOLARISC52"
 cairo_LDFLAGS+=-Wl,-R\$$$$ORIGIN:\$$$$ORIGIN/../ure-link/lib
 .ENDIF  # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
--- cairo/pixman/makefile.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ cairo/pixman/makefile.mk	2012-08-28 19:45:31.000000000 -0400
@@ -97,8 +97,8 @@
 .ELSE
 # ----------- Unix ---------------------------------------------------------
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
-.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+LDFLAGS:=-Wl,-z,origin,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
 
 .IF "$(OS)$(COM)"=="SOLARISC52"
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
--- libxmlsec/makefile.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ libxmlsec/makefile.mk	2012-08-28 19:46:05.000000000 -0400
@@ -143,8 +143,8 @@
 .ENDIF
 
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ENDIF			# "$(OS)$(COM)"=="LINUXGCC"
+xmlsec_LDFLAGS+=-Wl,-z,origin,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
+.ENDIF			# "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 .ENDIF			# "$(OS)$(COM)"=="SOLARISC52"
--- libxslt/makefile.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ libxslt/makefile.mk	2012-08-28 19:46:28.000000000 -0400
@@ -103,8 +103,8 @@
 .ELSE
 
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
-.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+LDFLAGS:=-Wl,-z,origin,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 .ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
--- moz/seamonkey-source-1.1.14.patch.orig	2012-07-27 08:37:04.000000000 -0400
+++ moz/seamonkey-source-1.1.14.patch	2012-08-28 20:17:30.000000000 -0400
@@ -86,16 +86,23 @@
  PYTHON = @MOZ_PYTHON@
 --- misc/mozilla/config/config.mk	2008-01-29 20:30:22.000000000 +0100
 +++ misc/build/mozilla/config/config.mk	2008-08-14 16:22:21.000000000 +0200
-@@ -758,6 +758,23 @@
+@@ -758,6 +758,30 @@
  endif
  
  #
 +# Shared library RUNPATH linker option(s)
 +#
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_DSO_LDOPTS += -Wl,-z,origin,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-z,origin,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
++endif # IS_COMPONENT
++endif # FreeBSD
++
 +ifeq ($(OS_ARCH),Linux)
-+EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++EXTRA_DSO_LDOPTS += -Wl,-z,origin,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
 +ifdef IS_COMPONENT
-+EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
++EXTRA_DSO_LDOPTS += -Wl,-z,origin,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
 +endif # IS_COMPONENT
 +endif # Linux
 +
@@ -460,6 +467,14 @@
  ifeq ($(BUILD_OPT), 1)
 --- misc/mozilla/directory/c-sdk/config/FreeBSD.mk	2006-02-03 15:41:11.000000000 +0100
 +++ misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk	2008-08-14 16:22:21.000000000 +0200
+@@ -52,6 +52,7 @@
+ 
+ DSO_CFLAGS		= -fPIC
+ DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
++DSO_LDOPTS		+= -Wl,-z,origin,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+ 
+ #
+ # The default implementation strategy for FreeBSD is pthreads.
 @@ -70,7 +70,7 @@
  
  ARCH			= freebsd
@@ -510,7 +525,7 @@
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    DSO_LDOPTS="$DSO_LDOPTS -Wl,-rpath,'$\$ORIGIN:$\$ORIGIN/../ure-link/lib'"
++    DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,origin,-rpath,'$\$ORIGIN:$\$ORIGIN/../ure-link/lib'"
      OS_LIBS="$OS_LIBS -lc"
      _OPTIMIZE_FLAGS=-O2
      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
@@ -579,7 +594,7 @@
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    DSO_LDOPTS="$DSO_LDOPTS -Wl,-rpath,'$\$ORIGIN:$\$ORIGIN/../ure-link/lib'"
++    DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,origin,-rpath,'$\$ORIGIN:$\$ORIGIN/../ure-link/lib'"
      OS_LIBS="$OS_LIBS -lc"
      _OPTIMIZE_FLAGS=-O2
      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
@@ -5793,12 +5808,16 @@
      else
 --- misc/mozilla/nsprpub/lib/ds/Makefile.in	2006-12-22 14:47:17.000000000 +0100
 +++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in	2008-08-14 16:22:21.000000000 +0200
-@@ -79,18 +79,22 @@
+@@ -79,18 +79,26 @@
  OS_LIBS = -lc
  endif
  
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
 +ifeq ($(OS_ARCH),Linux)
-+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++MKSHLIB += -Wl,-z,origin,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
 +endif
 +
  ifeq ($(OS_ARCH),SunOS)
@@ -5821,12 +5840,16 @@
  # dependencies in the same directory where it resides.
 --- misc/mozilla/nsprpub/lib/libc/src/Makefile.in	2006-12-22 14:47:17.000000000 +0100
 +++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in	2008-08-14 16:22:21.000000000 +0200
-@@ -89,18 +89,22 @@
+@@ -89,18 +89,26 @@
  OS_LIBS = -lc
  endif
  
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
 +ifeq ($(OS_ARCH),Linux)
-+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++MKSHLIB += -Wl,-z,origin,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
 +endif
 +
  ifeq ($(OS_ARCH),SunOS)
@@ -5885,7 +5908,7 @@
  
  DSO_CFLAGS		= -fPIC
  DSO_LDOPTS		= -shared $(ARCHFLAG)
-+DSO_LDOPTS		+= -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++DSO_LDOPTS		+= -Wl,-z,origin,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
  DSO_LDFLAGS		=
  LDFLAGS			+= $(ARCHFLAG)
  
--- nss/nss.patch.orig	2012-07-27 08:37:04.000000000 -0400
+++ nss/nss.patch	2012-08-28 20:28:34.000000000 -0400
@@ -5,7 +5,7 @@
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
 -    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    DSO_LDOPTS='-shared -Wl,-rpath,\$$ORIGIN -Wl,-soname -Wl,$(notdir $@)'
++    DSO_LDOPTS='-shared -Wl,-z,origin,-rpath,\$$ORIGIN -Wl,-soname -Wl,$(notdir $@)'
      _OPTIMIZE_FLAGS=-O2
      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
                                     # combo is not yet good at debugging inlined
@@ -26,6 +26,16 @@
  RANLIB		= ranlib
  
  ifndef CPU_ARCH
+--- misc/nss-3.13.5/mozilla/security/coreconf/FreeBSD.mk	2009-11-23 05:06:29.000000000 -0500
++++ misc/build/nss-3.13.5/mozilla/security/coreconf/FreeBSD.mk	2012-08-28 20:27:20.000000000 -0400
+@@ -57,6 +57,7 @@
+ 
+ DSO_CFLAGS		= -fPIC
+ DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
++DSO_LDOPTS		+= '-Wl,-z,origin,-rpath,$$ORIGIN'
+ 
+ #
+ # The default implementation strategy for FreeBSD is pthreads.
 --- misc/nss-3.13.5/mozilla/security/coreconf/Linux.mk	2010-01-15 23:19:00.000000000 +0100
 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/Linux.mk	2010-06-11 16:35:54.981151732 +0200
 @@ -46,8 +46,11 @@
@@ -47,7 +57,7 @@
  # we don't use -z defs there.
  ZDEFS_FLAG		= -Wl,-z,defs
 -DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
-+DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN'
++DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-z,origin,-rpath,$$ORIGIN'
  LDFLAGS			+= $(ARCHFLAG)
  
  # INCLUDES += -I/usr/include -Y/usr/include/linux
@@ -100,7 +110,7 @@
  ifndef BUILD_OPT
 --- misc/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk	2010-02-04 19:59:10.000000000 +0100
 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk	2010-06-11 16:35:55.004869805 +0200
-@@ -41,27 +41,28 @@
+@@ -41,27 +41,32 @@
  ifeq ($(OS_ARCH), SunOS) 
  ifeq ($(BUILD_SUN_PKG), 1)
  ifeq ($(USE_64), 1)
@@ -117,22 +127,26 @@
  endif
  endif
  
++ifeq ($(OS_ARCH), FreeBSD)
++EXTRA_SHARED_LIBS += -Wl,-z,origin,-rpath,'$$ORIGIN'
++endif
++
  ifeq ($(OS_ARCH), Linux)
  ifeq ($(BUILD_SUN_PKG), 1)
  ifeq ($(USE_64), 1)
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
++EXTRA_SHARED_LIBS += -Wl,-z,origin,-rpath,'$$ORIGIN'
  else
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
-+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
++EXTRA_SHARED_LIBS += -Wl,-z,origin,-rpath,'$$ORIGIN'
  endif
  else
  ifeq ($(USE_64), 1)
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
++EXTRA_SHARED_LIBS += -Wl,-z,origin,-rpath,'$$ORIGIN'
  else
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
++EXTRA_SHARED_LIBS += -Wl,-z,origin,-rpath,'$$ORIGIN'
  endif
  endif
  endif
--- odk/settings/settings.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ odk/settings/settings.mk	2012-08-28 19:38:00.000000000 -0400
@@ -331,7 +331,7 @@
 
 CC_OUTPUT_SWITCH=-o
 
-LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
+LIBRARY_LINK_FLAGS=-shared '-Wl,-z,origin,-rpath,$$ORIGIN'
 
 ifeq "$(PROCTYPE)" "ppc"
 LIBRARY_LINK_FLAGS+=-fPIC
@@ -566,7 +566,7 @@
 
 CC_OUTPUT_SWITCH=-o
 
-LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
+LIBRARY_LINK_FLAGS=-shared '-Wl,-z,origin,-rpath,$$ORIGIN'
 COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
 
 EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined 
--- redland/rasqal/makefile.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ redland/rasqal/makefile.mk	2012-08-28 19:38:00.000000000 -0400
@@ -98,7 +98,7 @@
 .ELSE # "WNT"
 
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
+LDFLAGS:=-Wl,-z,origin,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
--- redland/raptor/makefile.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ redland/raptor/makefile.mk	2012-08-28 19:38:00.000000000 -0400
@@ -117,7 +117,7 @@
 .ELSE # "WNT"
 
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
+LDFLAGS:=-Wl,-z,origin,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
--- redland/redland/makefile.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ redland/redland/makefile.mk	2012-08-28 19:38:00.000000000 -0400
@@ -98,7 +98,7 @@
 .ELSE # "WNT"
 
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
+LDFLAGS:=-Wl,-z,origin,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
--- registry/workben/makefile.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ registry/workben/makefile.mk	2012-08-28 19:38:00.000000000 -0400
@@ -63,8 +63,8 @@
 APP2RPATH=NONE
 .IF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX"
 
-.IF "$(OS)"=="LINUX"
-APP2LINKFLAGS=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\'
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+APP2LINKFLAGS=-Wl,-z,origin,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\'
 .ENDIF
 
 .IF "$(OS)"=="SOLARIS"
--- solenv/gbuild/platform/unxgcc.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ solenv/gbuild/platform/unxgcc.mk	2012-08-28 19:38:01.000000000 -0400
@@ -297,7 +297,7 @@
 	$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
 define gb_Library__get_rpath
-$(if $(1),$(strip '-Wl,-rpath,$(1)' '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'))
+$(if $(1),$(strip '-Wl,-z,origin,-rpath,$(1)' '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'))
 endef
 
 define gb_Library_get_rpath
@@ -338,7 +338,7 @@
 
 
 define gb_Executable_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \
+'-Wl,-z,origin,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \
 -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
 endef
 
--- solenv/inc/unxgcc.mk.orig	2012-07-27 08:37:04.000000000 -0400
+++ solenv/inc/unxgcc.mk	2012-08-28 19:38:01.000000000 -0400
@@ -191,11 +191,11 @@
 # entry. This will cause both, DT_RPATH and DT_RUNPATH entries, to be created
 #
 LINKFLAGSDEFS*=-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin,-rpath,\''$$ORIGIN'\',--enable-new-dtags
+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
-LINKFLAGSRUNPATH_SDKBIN=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_SDKBIN=-Wl,-z,origin,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 # flag -Wl,-z,noexecstack sets the NX bit on the stack
--- stlport/STLport-4.5.patch.orig	2012-07-27 08:37:04.000000000 -0400
+++ stlport/STLport-4.5.patch	2012-08-28 19:38:01.000000000 -0400
@@ -137,7 +137,7 @@
 +#
 +#
 +LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o
++DYN_LINK=${CXX} -Wl,-z,origin,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o
 +
 +OBJEXT=o
 +DYNEXT=so
@@ -449,7 +449,7 @@
 +#
 +#
 +LINK=ar cr
-+DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o
++DYN_LINK=$(CXX) -Wl,-z,origin,-rpath,'$$ORIGIN' -fexceptions -shared -o
 +
 +OBJEXT=o
 +DYNEXT=so