[Libreoffice-commits] .: crashrep/source extensions/source fpicker/source pyuno/zipcore Repository.mk shell/source solenv/bin solenv/gbuild solenv/inc
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Oct 24 13:57:20 PDT 2011
Repository.mk | 11 ++++-------
crashrep/source/unx/makefile.mk | 2 +-
crashrep/source/win32/makefile.mk | 2 +-
extensions/source/nsplugin/source/makefile.mk | 4 ++--
fpicker/source/unx/kde/makefile.mk | 2 +-
pyuno/zipcore/makefile.mk | 2 +-
shell/source/unix/misc/makefile.mk | 4 ++--
shell/source/win32/simplemail/makefile.mk | 2 +-
solenv/bin/macosx-change-install-names.pl | 5 ++---
solenv/gbuild/Helper.mk | 2 +-
solenv/gbuild/platform/ios.mk | 1 -
solenv/gbuild/platform/macosx.mk | 2 --
solenv/gbuild/platform/solaris.mk | 2 --
solenv/gbuild/platform/unxgcc.mk | 2 --
solenv/inc/settings.mk | 1 -
solenv/inc/unxaigppc.mk | 1 -
solenv/inc/unxgcc.mk | 1 -
solenv/inc/unxmacx.mk | 1 -
solenv/inc/unxnbsd.mk | 1 -
solenv/inc/unxsoli4.mk | 1 -
solenv/inc/unxsols4.mk | 1 -
solenv/inc/unxsolu4.mk | 1 -
22 files changed, 16 insertions(+), 35 deletions(-)
New commits:
commit d03465a44618e1158acd63cb5ab6a39b4e2778a2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 24 22:56:33 2011 +0200
Undo basis/brand split: removed RPATH BRAND (same as OOO now).
diff --git a/Repository.mk b/Repository.mk
index d6269b8..5fab1b5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -46,15 +46,12 @@ $(eval $(call gb_Helper_register_executables,NONE, \
$(eval $(call gb_Helper_register_executables,OOO, \
spadmin.bin \
-))
-
-$(eval $(call gb_Helper_register_executables,BRAND,\
testtool \
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_executables,BRAND,\
+$(eval $(call gb_Helper_register_executables,OOO,\
guiloader \
guistdio \
loader2 \
@@ -76,20 +73,20 @@ $(eval $(call gb_Helper_register_executables,BRAND,\
else
-$(eval $(call gb_Helper_register_executables,BRAND,\
+$(eval $(call gb_Helper_register_executables,OOO,\
soffice.bin \
unopkg.bin \
))
ifeq ($(OS),MACOSX)
-$(eval $(call gb_Helper_register_executables,BRAND,\
+$(eval $(call gb_Helper_register_executables,OOO,\
officeloader \
))
else
-$(eval $(call gb_Helper_register_executables,BRAND,\
+$(eval $(call gb_Helper_register_executables,OOO,\
oosplash \
))
diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk
index d0d04ff..83eb3b8 100755
--- a/crashrep/source/unx/makefile.mk
+++ b/crashrep/source/unx/makefile.mk
@@ -54,7 +54,7 @@ OBJFILES=\
APP1NOSAL=TRUE
APP1TARGET=$(TARGET)
APP1OBJS=$(OBJFILES)
-APP1RPATH=BRAND
+APP1RPATH=OOO
.IF "$(OS)" != "FREEBSD" && "$(OS)" != "MACOSX" && "$(OS)"!="NETBSD" && \
"$(OS)" != "DRAGONFLY"
diff --git a/crashrep/source/win32/makefile.mk b/crashrep/source/win32/makefile.mk
index 21c0ab3..d1fe9fa 100644
--- a/crashrep/source/win32/makefile.mk
+++ b/crashrep/source/win32/makefile.mk
@@ -59,7 +59,7 @@ APP1OBJS=$(OBJFILES)
APP1NOSAL=TRUE
APP1TARGET=$(TARGET)
-APP1RPATH=BRAND
+APP1RPATH=OOO
STDLIB1=\
$(SALLIB)\
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index aac2a48..01e8a39 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -116,7 +116,7 @@ SHL1STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB)
SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=BRAND
+SHL1RPATH=OOO
# ----- get some additional keys in versioninfo ------------
SHL1ADD_VERINFO=nsplugin.rc
@@ -140,7 +140,7 @@ SHL2STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB)
SHL2DEPN=
SHL2IMPLIB= i$(SHL2TARGET)
SHL2DEF= $(MISC)$/$(SHL2TARGET).def
-SHL2RPATH=BRAND
+SHL2RPATH=OOO
# ----- get some additional keys in versioninfo ------------
SHL2ADD_VERINFO=nsplugin_oo.rc
diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
index 20b27d5..1548d7b 100644
--- a/fpicker/source/unx/kde/makefile.mk
+++ b/fpicker/source/unx/kde/makefile.mk
@@ -63,7 +63,7 @@ SLOFILES =\
APP1TARGET=$(TARGET)
APP1OBJS=$(SLOFILES)
-APP1RPATH=BRAND
+APP1RPATH=OOO
APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11
APP1STDLIBS=$(SALLIB)
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk
index abc42b3..ce0a3a4 100755
--- a/pyuno/zipcore/makefile.mk
+++ b/pyuno/zipcore/makefile.mk
@@ -66,7 +66,7 @@ FILES=\
APP1TARGET=python
APP1OBJS=$(OBJFILES) $(SOLARLIBDIR)/pathutils-obj.obj
APP1STDLIBS=
-APP1RPATH=BRAND
+APP1RPATH=OOO
OBJFILES=$(OBJ)/python.obj
.ENDIF
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index 3f1b64e..840f372 100644
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -51,7 +51,7 @@ APP1TARGET = gnome-open-url.bin
APP1OBJS = \
$(OBJ)$/gnome-open-url.obj
APP1LIBS =
-APP1RPATH = BRAND
+APP1RPATH = OOO
.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && \
"$(OS)"!="DRAGONFLY"
APP1STDLIBS=-ldl
@@ -60,7 +60,7 @@ APP1STDLIBS=-ldl
APP2TARGET = uri-encode
APP2OBJS = $(OBJ)$/uri-encode.obj
APP2LIBS =
-APP2RPATH = BRAND
+APP2RPATH = OOO
APP2STDLIBS =
OBJFILES = $(APP1OBJS) $(APP2OBJS)
diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk
index 3e8b15f..b9e66d5 100644
--- a/shell/source/win32/simplemail/makefile.mk
+++ b/shell/source/win32/simplemail/makefile.mk
@@ -70,7 +70,7 @@ APP1TARGET=senddoc
APP1OBJS=$(OBJFILES)
APP1STDLIBS=$(KERNEL32LIB)\
$(SALLIB)
-APP1RPATH = BRAND
+APP1RPATH = OOO
APP1DEF=$(MISC)$/$(APP1TARGET).def
# --- Targets ------------------------------------------------------
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 8ff051e..57f4e79 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -33,9 +33,8 @@ sub action($$$)
my %action =
('app/UREBIN/URELIB' => '@executable_path/../lib',
'app/OOO/URELIB' => '@executable_path/../ure-link/lib',
+ 'app/OOO/OOO' => '@executable_path',
'app/SDK/URELIB' => '@executable_path/../../ure-link/lib',
- 'app/BRAND/URELIB' => '@executable_path/../ure-link/lib',
- 'app/BRAND/OOO' => '@executable_path',
'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__',
@@ -55,7 +54,7 @@ sub action($$$)
}
@ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or die
- 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|NONE|LOADER <filepath>*';
+ 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|OXT|NONE|LOADER <filepath>*';
$type = shift @ARGV;
$loc = shift @ARGV;
if ($type eq "SharedLibrary")
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index bffaf8a..8214468 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -97,7 +97,7 @@ $(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo)))
endef
define gb_Helper_init_registries
-gb_Executable_VALIDGROUPS := UREBIN SDK OOO BRAND NONE
+gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index a131a8a..8d3fec8 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -368,7 +368,6 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \
$(foreach exe,$(gb_Executable_SDK),$(exe):OOO) \
$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
- $(foreach exe,$(gb_Executable_BRAND),$(exe):OOO) \
$(foreach exe,$(gb_Executable_NONE),$(exe):OOO) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 37adf1b..936b27c 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -277,7 +277,6 @@ gb_LinkTarget__RPATHS := \
URELIB:@__________________________________________________URELIB/ \
UREBIN: \
OOO:@__________________________________________________OOO/ \
- BRAND: \
SDKBIN: \
NONE:@__VIA_LIBRARY_PATH__@ \
@@ -457,7 +456,6 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
- $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index b4627a1..163a257 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -191,7 +191,6 @@ gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
- BRAND:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
NONE:\dORIGIN/../lib:\dORIGIN \
@@ -326,7 +325,6 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
- $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 27d6761..e3e168d 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -306,7 +306,6 @@ gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
- BRAND:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
NONE:\dORIGIN/../lib:\dORIGIN \
@@ -446,7 +445,6 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
- $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 0d791e5..45f85c7 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1278,7 +1278,6 @@ LINKFLAGSRUNPATH_URELIB*=
LINKFLAGSRUNPATH_UREBIN*=
LINKFLAGSRUNPATH_OOO*=
LINKFLAGSRUNPATH_SDK*=
-LINKFLAGSRUNPATH_BRAND*=
LINKFLAGSRUNPATH_OXT*=
LINKFLAGSRUNPATH_NONE*=
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
index 2b65c45..5e67079 100644
--- a/solenv/inc/unxaigppc.mk
+++ b/solenv/inc/unxaigppc.mk
@@ -44,7 +44,6 @@ 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_BRAND:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
LINKFLAGSAPPGUI:=
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index e6ed19b..7fb14d3 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -177,7 +177,6 @@ LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-d
#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_BRAND=-Wl,-rpath,\''$$ORIGIN:$$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 18fd01e..8471cee 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -183,7 +183,6 @@ LINKFLAGSRUNPATH_URELIB=-install_name '@________________________________________
LINKFLAGSRUNPATH_UREBIN=
LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)'
LINKFLAGSRUNPATH_SDK=
-LINKFLAGSRUNPATH_BRAND=
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
LINKFLAGS=$(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxnbsd.mk b/solenv/inc/unxnbsd.mk
index b7d5e04..712ed6a 100644
--- a/solenv/inc/unxnbsd.mk
+++ b/solenv/inc/unxnbsd.mk
@@ -19,7 +19,6 @@ BUILD64=1
LINKFLAGSRUNPATH_UREBIN=
LINKFLAGSRUNPATH_OOO=
LINKFLAGSRUNPATH_SDK=
-LINKFLAGSRUNPATH_BRAND=
LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index e3df189..af85064 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -132,7 +132,6 @@ 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_BRAND=-R\''$$ORIGIN:$$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 447d5b3..e81ca0e 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -138,7 +138,6 @@ 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_BRAND=-R\''$$ORIGIN:$$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/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 224bb0e..0beea48 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -132,7 +132,6 @@ 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_BRAND=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
More information about the Libreoffice-commits
mailing list