Repository.mk | 6 ------
bridges/CustomTarget_gcc3_ios_arm.mk | 3 +--
sal/inc/sal/mathconf.h | 10 ----------
sc/CppunitTest_sc_annotationshapeobj.mk | 3 ++-
sc/CppunitTest_sc_cellrangeobj.mk | 3 ++-
sc/CppunitTest_sc_chart_regression_test.mk | 3 ++-
sc/CppunitTest_sc_datapilotfieldobj.mk | 3 ++-
sc/CppunitTest_sc_datapilottableobj.mk | 3 ++-
sc/CppunitTest_sc_editfieldobj_cell.mk | 3 ++-
sc/CppunitTest_sc_editfieldobj_header.mk | 3 ++-
sc/CppunitTest_sc_macros_test.mk | 3 ++-
sc/CppunitTest_sc_modelobj.mk | 3 ++-
sc/CppunitTest_sc_namedrangeobj.mk | 3 ++-
sc/CppunitTest_sc_namedrangesobj.mk | 3 ++-
sc/CppunitTest_sc_rangelst_test.mk | 3 ++-
sc/CppunitTest_sc_tableautoformatfield.mk | 3 ++-
sc/CppunitTest_sc_tablesheetobj.mk | 3 ++-
sc/CppunitTest_sc_tablesheetsobj.mk | 3 ++-
solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 +++
19 files changed, 34 insertions(+), 33 deletions(-)
New commits:
commit cc1a1123dbed3c13180fbd43328168008692f224
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 15:42:40 2012 +0300
No vbaobj component if DISABLE_SCRIPTING
Change-Id: I8b00febb62502280afa6106289104af151caf9c5
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk
b/sc/CppunitTest_sc_annotationshapeobj.mk
index 9522e27..841b34a 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -103,7 +103,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_annonationshapeobj,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk
b/sc/CppunitTest_sc_cellrangeobj.mk
index 814e9cb..b0a6321 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -104,7 +104,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_cellrangesbase,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk
b/sc/CppunitTest_sc_chart_regression_test.mk
index 1ca505b..c45aa69 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -104,7 +104,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_chart_regression_test,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scaddins/source/analysis/analysis \
scaddins/source/datefunc/date \
scripting/source/basprov/basprov \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk
b/sc/CppunitTest_sc_datapilotfieldobj.mk
index d221fe5..7d86cb5 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -103,7 +103,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_datapilotfieldobj,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk
b/sc/CppunitTest_sc_datapilottableobj.mk
index 77f2b0b..3320717 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -103,7 +103,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_datapilottableobj,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk
b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 3f75acb..b4f8062 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -103,7 +103,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_editfieldobj_cell,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk
b/sc/CppunitTest_sc_editfieldobj_header.mk
index 32ac457..ba55b65 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -103,7 +103,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_editfieldobj_header,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index c74f494..fca4947 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -100,7 +100,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 4548f4b..de62eb6 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk
b/sc/CppunitTest_sc_namedrangeobj.mk
index ffca9b3..c2f1d43 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -103,7 +103,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_namedrangeobj,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk
b/sc/CppunitTest_sc_namedrangesobj.mk
index 49a87b4..84d7f37 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -103,7 +103,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_namedrangesobj,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_rangelst_test.mk
b/sc/CppunitTest_sc_rangelst_test.mk
index a97a4b1..44c6b52 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -104,7 +104,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_rangelst_test,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scaddins/source/analysis/analysis \
scaddins/source/datefunc/date \
scripting/source/basprov/basprov \
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk
b/sc/CppunitTest_sc_tableautoformatfield.mk
index 23cab33..94b3110 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -103,7 +103,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_tableautoformatfield,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk
b/sc/CppunitTest_sc_tablesheetobj.mk
index 1bf3bd9..067ed9e 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -104,7 +104,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_spreadsheetobj,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk
b/sc/CppunitTest_sc_tablesheetsobj.mk
index 478dcb0..e950830 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -103,7 +103,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_spreadsheetsobj,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
- sc/util/vbaobj \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
scripting/source/basprov/basprov \
scripting/util/scriptframe \
sfx2/util/sfx \
commit 9da897b56d5e2d95c50a8edd54a4a2aff31bc0dd
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 15:42:12 2012 +0300
Need -DBOOST_DETAIL_NO_CONTAINER_FWD here, too
Change-Id: Ice20b6903f7bf26547a7a3e2bf3cec6c831a6734
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 21301fa..7636cef 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -79,6 +79,9 @@ gb_OBJCXXFLAGS := -x objective-c++
$(gb_OBJC_OBJCXX_COMMON_FLAGS)
gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
+gb_COMPILERDEFS += \
+ -DBOOST_DETAIL_NO_CONTAINER_FWD
+
gb_LinkTarget_LDFLAGS := \
$(subst -L../lib , ,$(SOLARLIB)) \
#man ld says: obsolete -Wl,-multiply_defined,suppress \
commit 35130c7c4d7992cd10f3bb232eecd7752b1a8c9d
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 15:41:47 2012 +0300
Make this actually work
Change-Id: Icfe773e8f440372645b7a57dba1ab7f8fac3caaa
diff --git a/bridges/CustomTarget_gcc3_ios_arm.mk
b/bridges/CustomTarget_gcc3_ios_arm.mk
index c8c633e..fd97131 100644
--- a/bridges/CustomTarget_gcc3_ios_arm.mk
+++ b/bridges/CustomTarget_gcc3_ios_arm.mk
@@ -15,8 +15,7 @@ $(call
gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_ios_arm) : \
$(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/codesnippets.S
: \
$(SRCDIR)/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
-
-$(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/codesnippets.S
:
+ mkdir -p $(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)
$(PERL) $< > $@
# vim: set noet sw=4 ts=4:
commit cb5730dc277a98b45c120b6fb0847c32620da478
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 15:40:49 2012 +0300
Seems that the iOS-specific crack is not needed any longer
Change-Id: I91a7f74e55b6ad8780a3a0920a22b6a7264b7b88
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index c03adc4..f92d8b4 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -69,16 +69,6 @@ extern "C" {
#define SAL_MATH_FINITE(d) std::isfinite(d)
#elif defined( WNT)
#define SAL_MATH_FINITE(d) _finite(d)
-#elif defined IOS
-/* C++ is so nice. This is the only way I could come up with making
- * this actually work in all cases (?), even when <cmath> has been
- * included which #undefs isfinite: copy the definition of isfinite()
- * from <architecture/arm/math.h>
- */
-#define SAL_MATH_FINITE(d) \
- ( sizeof (d) == sizeof(float ) ? __inline_isfinitef((float)(d)) \
- : sizeof (d) == sizeof(double) ? __inline_isfinited((double)(d)) \
- : __inline_isfinite ((long double)(d)))
#elif defined LINUX || defined UNX
#define SAL_MATH_FINITE(d) finite(d)
#else /* WNT, LINUX, UNX */
commit f2389862ea0459d6e17e718f33e1674a63a9bb19
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 11:20:02 2012 +0300
gcc3_uno is listed cross-platform already nowadays
Change-Id: I8dc776d6d96dbe022908418b64dc130d619753c4
diff --git a/Repository.mk b/Repository.mk
index aacd703..fdc4ce6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -521,12 +521,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
endif
-ifeq ($(OS),IOS)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- gcc3_uno \
-))
-endif
-
$(eval $(call gb_Helper_register_libraries,RTLIBS, \
comphelper \
i18nisolang1 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
