[Libreoffice-commits] .: 4 commits - configure.in connectivity/Library_dbtools.mk ios/qa

[Libreoffice Gerrit user]

 configure.in                    |    7 +++++--
 connectivity/Library_dbtools.mk |    2 +-
 ios/qa/sc/Makefile              |    4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 18ac29d515af36ae4240d5d48dfa7814cfd8d075
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 20 16:57:41 2012 +0300

    No jvmaccess for iOS
    
    Change-Id: Ifc83795c84cc82832a185317d4aa3554419e31e3

diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 0d321a0..4a26a31 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
 	cppuhelper \
 	sal \
 	salhelper \
-	jvmaccess \
+	$(if $(filter IOS,$(OS)),,jvmaccess) \
 	utl \
 	tl \
 	comphelper \
commit ac0d668a407cc441dacc7d9a9edb70aff555a518
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 20 15:49:09 2012 +0300

    Skip DISABLE_DBCONNECTIVITY attempts for now
    
    Change-Id: I3d454d10aee05ce5b4bfd8ea0852bbc751933058

diff --git a/configure.in b/configure.in
index 6f8d115..3a52117 100644
--- a/configure.in
+++ b/configure.in
@@ -2239,9 +2239,12 @@ if test -z "$enable_database_connectivity"; then
     # Do enable database connectivity for Android for now as otherwise
     # we presumably will get linking errors... We are not as far in
     # the work for iOS, so we might as well disable it for iOS already.
-    if test $_os != iOS; then
+
+    # And actually, do enable it for iOS, too. Let's get back to
+    # figuring out what to do with this later, if ever.
+    #if test $_os != iOS; then
         enable_database_connectivity=yes
-    fi
+    #fi
 fi
 
 DISABLE_DBCONNECTIVITY=''
commit 616b6211b7c5165620d7b80467d1d02688d09a0d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 20 15:41:35 2012 +0300

    No libi18npaperlo any more
    
    Change-Id: I544a352fe0e43140d1bae62a95bf383c1432a076

diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 8707dd4..76d5450 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -39,7 +39,7 @@ SRCS = filters-test.m
 
 CFLAGS = $(SOLARINC)
 
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -l
 tllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -l
 ucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
 
 all: $(APPDIR)/$(APP) stuff
 
commit 69cf7d51c971f95df409b72b0695231a22037878
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 20 15:38:50 2012 +0300

    Just look at $(CC) to find out which arch the tree is for
    
    Change-Id: I0af01be14f992a4842d174f06815e65895f0ee69

diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 4174214..8707dd4 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -5,7 +5,7 @@ APP=lo-qa-sc-filters-test
 # If run from Xcode, check the CURRENT_ARCH env var for which platform we are
 # building, device or simulator
 
-ifeq ($(CURRENT_ARCH),i386)
+ifneq (,$(filter i386,$(CC)))
 PLATFORM=iphonesimulator
 else
 PLATFORM=iphoneos