[Libreoffice-commits] .: solenv/inc

[David Tardon]

 solenv/inc/settings.mk  |    2 +-
 solenv/inc/unxaigppc.mk |    2 +-
 solenv/inc/unxandr.mk   |    2 +-
 solenv/inc/unxgcc.mk    |    2 +-
 solenv/inc/unxmacx.mk   |    2 +-
 solenv/inc/unxnbsd.mk   |    2 +-
 solenv/inc/unxsoli4.mk  |    2 +-
 solenv/inc/unxsols4.mk  |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bcc942451d7b5291d3f4c56ccd6868b23e2e923c
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Apr 14 08:11:37 2012 +0200

    really replace SDK with SDKBIN

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 9988f7c..575fdc9 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1226,7 +1226,7 @@ RCLINKFLAGS+= $(ENVRCLINKFLAGS)
 LINKFLAGSRUNPATH_URELIB*=
 LINKFLAGSRUNPATH_UREBIN*=
 LINKFLAGSRUNPATH_OOO*=
-LINKFLAGSRUNPATH_SDK*=
+LINKFLAGSRUNPATH_SDKBIN*=
 LINKFLAGSRUNPATH_OXT*=
 LINKFLAGSRUNPATH_NONE*=
 
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
index 5e67079..983ae74 100644
--- a/solenv/inc/unxaigppc.mk
+++ b/solenv/inc/unxaigppc.mk
@@ -43,7 +43,7 @@ BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt
 LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
 LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
 LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_SDKBIN:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
 LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
 
 LINKFLAGSAPPGUI:=
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index e8cbd9e..812c932 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -66,4 +66,4 @@ ENFORCEDSHLPREFIX=lib
 LINKFLAGSRUNPATH_URELIB=
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 151fc8b..2da3ef0 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -195,7 +195,7 @@ LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
 LINKFLAGSRUNPATH_UREBIN=-Wl,-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_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_SDKBIN=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 # flag -Wl,-z,noexecstack sets the NX bit on the stack
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index c829a45..e402783 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -185,7 +185,7 @@ EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH)
 LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)'
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)'
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
 LINKFLAGS=$(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxnbsd.mk b/solenv/inc/unxnbsd.mk
index 712ed6a..8dbe480 100644
--- a/solenv/inc/unxnbsd.mk
+++ b/solenv/inc/unxnbsd.mk
@@ -18,7 +18,7 @@ BUILD64=1
 # NetBSD has no support for using relative paths with $ORIGIN
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
 
 LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index af85064..9120433 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -131,7 +131,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index e81ca0e..f1a1cd1 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -137,7 +137,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd