RepositoryExternal.mk | 2 +-
solenv/gbuild/UnoApiTarget.mk | 4 ++--
solenv/inc/_tg_shl.mk | 20 ++++++++++----------
solenv/inc/tg_shl.mk | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 084db5f74e9d9c32632df6d15e6cff1c43c2c5a7
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Sep 24 10:37:25 2012 +0300
Don't use gb_ICU_suffix on Android when DISABLE_DYNLOADING
Change-Id: Ie4a76ddb1db8d45e32d64d13aca01a0b29b519d2
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 914b97b..1c030fd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -804,7 +804,7 @@ endef
else # !SYSTEM_ICU
-ifeq ($(OS),ANDROID)
+ifeq ($(OS)$(DISABLE_DYNLOADING),ANDROID)
gb_ICU_suffix:=lo
else
gb_ICU_suffix:=
commit 1e605fcd4e4e68c5795ad98c9775a15308ccb6f5
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Sep 24 10:35:20 2012 +0300
Check DISABLE_DYNLOADING, not just iOS
Change-Id: I839137b19c802c45eed73bae57beac81973d8da3
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index e666042..4aed3be 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -449,7 +449,7 @@ $(SHL1TARGETN) : \
.IF "$(SHL1NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1)
$(SHL1TARGETN)
.ENDIF # "$(SHL1NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB1FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL1OBJS)) $(shell cat /dev/null $(LIB1TARGET) $(SHL1LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@@ -934,7 +934,7 @@ $(SHL2TARGETN) : \
.IF "$(SHL2NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2)
$(SHL2TARGETN)
.ENDIF # "$(SHL2NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB2FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL2OBJS)) $(shell cat /dev/null $(LIB2TARGET) $(SHL2LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@@ -1419,7 +1419,7 @@ $(SHL3TARGETN) : \
.IF "$(SHL3NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3)
$(SHL3TARGETN)
.ENDIF # "$(SHL3NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB3FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL3OBJS)) $(shell cat /dev/null $(LIB3TARGET) $(SHL3LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@@ -1904,7 +1904,7 @@ $(SHL4TARGETN) : \
.IF "$(SHL4NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4)
$(SHL4TARGETN)
.ENDIF # "$(SHL4NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB4FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL4OBJS)) $(shell cat /dev/null $(LIB4TARGET) $(SHL4LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@@ -2389,7 +2389,7 @@ $(SHL5TARGETN) : \
.IF "$(SHL5NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5)
$(SHL5TARGETN)
.ENDIF # "$(SHL5NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB5FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL5OBJS)) $(shell cat /dev/null $(LIB5TARGET) $(SHL5LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@@ -2874,7 +2874,7 @@ $(SHL6TARGETN) : \
.IF "$(SHL6NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6)
$(SHL6TARGETN)
.ENDIF # "$(SHL6NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB6FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL6OBJS)) $(shell cat /dev/null $(LIB6TARGET) $(SHL6LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@@ -3359,7 +3359,7 @@ $(SHL7TARGETN) : \
.IF "$(SHL7NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7)
$(SHL7TARGETN)
.ENDIF # "$(SHL7NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB7FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL7OBJS)) $(shell cat /dev/null $(LIB7TARGET) $(SHL7LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@@ -3844,7 +3844,7 @@ $(SHL8TARGETN) : \
.IF "$(SHL8NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8)
$(SHL8TARGETN)
.ENDIF # "$(SHL8NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB8FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL8OBJS)) $(shell cat /dev/null $(LIB8TARGET) $(SHL8LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@@ -4329,7 +4329,7 @@ $(SHL9TARGETN) : \
.IF "$(SHL9NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9)
$(SHL9TARGETN)
.ENDIF # "$(SHL9NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB9FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL9OBJS)) $(shell cat /dev/null $(LIB9TARGET) $(SHL9LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@@ -4814,7 +4814,7 @@ $(SHL10TARGETN) : \
.IF "$(SHL10NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10)
$(SHL10TARGETN)
.ENDIF # "$(SHL10NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB10FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL10OBJS)) $(shell cat /dev/null $(LIB10TARGET) $(SHL10LIBS) | sed
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 3686b19..b7f24f2 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -478,7 +478,7 @@ $(SHL$(TNR)TARGETN) : \
.IF "$(SHL$(TNR)NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR)
$(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o
$(SHL$(TNR)OBJS)) $(shell cat /dev/null $(LIB$(TNR)TARGET) $(SHL$(TNR)LIBS) |
sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
commit 8b0a9dbe59b611c875e7e44e56a3421c761253b1
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Sep 24 10:33:48 2012 +0300
Check DISABLE_DYNLOADING, not just iOS
Change-Id: I56bed2cb5588fda364cf5a25ff9dff478f6a816a
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 2ddfeb3..c085c4c 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -313,7 +313,7 @@ endef
$(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
- $(if $(filter IOSudkapi,$(OS)$*), \
+ $(if $(filter TRUEudkapi,$(DISABLE_DYNLOADING)$*), \
$(call gb_Output_announce,$*,$(true),HPB,3) \
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call
gb_UnoApiHeadersTarget_get_bootstrap_dir,$*),-C), \
\
@@ -328,7 +328,7 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) :
\
$(call gb_UnoApiHeadersTarget_get_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
- $(if $(filter IOSudkapi,$(OS)$*), \
+ $(if $(filter TRUEudkapi,$(DISABLE_DYNLOADING)$*), \
$(call gb_Output_announce,$*,$(true),HPP,3) \
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call
gb_UnoApiHeadersTarget_get_dir,$*),-C), \
\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
