[Libreoffice-commits] core.git: 6 commits - fontconfig/ExternalProject_fontconfig.mk libxmlsec/ExternalPackage_xmlsec.mk nss/ExternalPackage_nss.mk postgresql/ExternalPackage_postgresql.mk postgresql/Module_postgresql.mk RepositoryExternal.mk Repository.mk sal/osl sw/source xmlsecurity/Library_xsec_xmlsec.mk

Michael Stahl mstahl at redhat.com
Tue Oct 1 02:34:44 PDT 2013


 Repository.mk                                |    7 
 RepositoryExternal.mk                        |    7 
 fontconfig/ExternalProject_fontconfig.mk     |    2 
 libxmlsec/ExternalPackage_xmlsec.mk          |   12 -
 nss/ExternalPackage_nss.mk                   |    2 
 postgresql/ExternalPackage_postgresql.mk     |   23 ---
 postgresql/Module_postgresql.mk              |    1 
 sal/osl/unx/asm/interlck_sparc.s             |  203 +--------------------------
 sal/osl/unx/system.c                         |   93 ------------
 sw/source/filter/ww8/docxattributeoutput.cxx |    2 
 xmlsecurity/Library_xsec_xmlsec.mk           |   24 +--
 11 files changed, 41 insertions(+), 335 deletions(-)

New commits:
commit 5249bd69ff7fa41d785a5bf9f4e7539ef8288438
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 1 00:22:51 2013 +0200

    nss: apparently libcrmf.a is unused
    
    Change-Id: I098f6824b39b72652d650171fa3021d777628af9

diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index f2b3935..c50a718 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_ExternalPackage_add_files,nss,bin,\
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
-		mozilla/dist/out/lib/libcrmf.a \
 		mozilla/dist/out/lib/libfreebl3.dylib \
 		mozilla/dist/out/lib/libnspr4.dylib \
 		mozilla/dist/out/lib/libnss3.dylib \
@@ -78,7 +77,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,bin,\
 ))
 else # OS!=WNT/MACOSX
 $(eval $(call gb_ExternalPackage_add_files,nss,lib,\
-		mozilla/dist/out/lib/libcrmf.a \
 		mozilla/dist/out/lib/libnsssysinit.so \
 ))
 $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
commit 1d633ca8dd12add335d36ad09086f29f76574a40
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 1 00:17:08 2013 +0200

    postgresql: remove ExternalPackage
    
    Change-Id: I8dadaf1f21bc16f6889a00a002c48cb3d93fbe01

diff --git a/postgresql/ExternalPackage_postgresql.mk b/postgresql/ExternalPackage_postgresql.mk
deleted file mode 100644
index 80ccbc9..0000000
--- a/postgresql/ExternalPackage_postgresql.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,postgresql,postgresql))
-
-$(eval $(call gb_ExternalPackage_use_external_project,postgresql,postgresql))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\
-	src/interfaces/libpq/libpq.lib \
-))
-else
-$(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\
-	src/interfaces/libpq/libpq.a \
-))
-endif
-# vim: set noet sw=4 ts=4:
diff --git a/postgresql/Module_postgresql.mk b/postgresql/Module_postgresql.mk
index 978cc06..80c8356 100644
--- a/postgresql/Module_postgresql.mk
+++ b/postgresql/Module_postgresql.mk
@@ -13,7 +13,6 @@ ifeq ($(SYSTEM_POSTGRESQL),NO)
 
 $(eval $(call gb_Module_add_targets,postgresql,\
 	ExternalProject_postgresql \
-	ExternalPackage_postgresql \
 	UnpackedTarball_postgresql \
 ))
 
commit cb177b6d798ce244ac35923f34fb93e8c8839ee3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 1 00:06:38 2013 +0200

    libxmlsec: stop delivering static and import libraries
    
    ... and also check COM instead of CROSS_COMPILING.
    
    Change-Id: I049c9211d4b6eabe4012f66d39d86c7b025dc18c

diff --git a/Repository.mk b/Repository.mk
index aaca80a..7e393d4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -652,12 +652,15 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	xmlsec1 \
-	xmlsec1-nss \
 ))
-ifneq ($(CROSS_COMPILING),YES)
+ifeq ($(COM),MSC)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	xmlsec1-mscrypto \
 ))
+else
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	xmlsec1-nss \
+))
 endif
 endif
 
diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk
index ca438c5..0655e97 100644
--- a/libxmlsec/ExternalPackage_xmlsec.mk
+++ b/libxmlsec/ExternalPackage_xmlsec.mk
@@ -13,24 +13,12 @@ $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll.a,src/.libs/libxmlsec1.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll.a,src/nss/.libs/libxmlsec1-nss.dll.a))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll))
 else
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec-mscrypto.lib,win32/binaries/libxmlsec-mscrypto.lib))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec.lib,win32/binaries/libxmlsec.lib))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec.dll,win32/binaries/libxmlsec.dll))
 endif
-else ifeq ($(OS),ANDROID)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
-ifneq ($(DISABLE_OPENSSL),YES)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-openssl.a,src/openssl/.libs/libxmlsec1-openssl.a))
-endif # DISABLE_OPENSSL
-else
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.a,src/nss/.libs/libxmlsec1-nss.a))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 164bec2..890ffc9 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -70,15 +70,16 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
 	xmlsecurity/source/xmlsec/nss/xsec_nss \
 ))
 
-ifeq ($(OS)$(CROSS_COMPILING),WNT)
+ifeq ($(OS)-$(COM),WNT-MSC)
 
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_CRYPTO_MSCRYPTO \
 ))
 
-$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
-	xmlsec1 \
-	xmlsec1-mscrypto \
+
+$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscrypto.lib \
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\
@@ -103,10 +104,15 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_CRYPTO_NSS \
 ))
 
-ifeq ($(OS)$(CROSS_COMPILING),WNTYES)
-$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
-	xmlsec1 \
-	xmlsec1-nss \
+ifeq ($(OS)-$(COM),WNT-GCC)
+$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.dll.a \
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.dll.a \
+))
+else ifeq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/openssl/.libs/libxmlsec1-openssl.a \
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
 ))
 else
 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
@@ -130,7 +136,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
 	xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \
 ))
 
-endif # ifeq ($(OS)$(CROSS_COMPILING),WNT)
+endif # ifeq ($(OS)-$(COM),WNT-GCC)
 
 ifeq ($(OS),SOLARIS)
 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
commit 2df9a25563b93ac0526725effec2a9b5b2de9d4f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 30 23:17:48 2013 +0200

    lcl_checkFrameBtlr: use SwTxtNode::GetTxtAttrAt
    
    ... which also finds the hint if it's not the first one in the array.
    
    Change-Id: I5ff61305bcc896de0269c5bf47b237dce00142c4

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1bb10ee..2b5b8c8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -324,7 +324,7 @@ bool lcl_checkFrameBtlr(SwNode* pStartNode, sax_fastparser::FastAttributeList* p
     if (!pTxtNode->HasHints())
         return false;
 
-    SwTxtAttr* pTxtAttr = pTxtNode->GetSwpHints().GetStart(0);
+    SwTxtAttr* pTxtAttr = pTxtNode->GetTxtAttrAt(0, RES_TXTATR_AUTOFMT);
 
     if (!pTxtAttr || pTxtAttr->Which() != RES_TXTATR_AUTOFMT)
         return false;
commit 8076eebf94da9cf803fcff80087d59cd2e13636b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 30 22:33:25 2013 +0200

    sal: require sun4u or newer hardware / SPARCv8plus / SPARCv9 CPU
    
    Drop implementation of osl_incrementInterlockedCount /
    osl_decrementInterlockedCount for antique 32-bit SPARC without
    cas instruction (sun4, sun4c, sun4d, sun4m).
    
    Apparently only NetBSD and OpenBSD even support such ancient hardware at
    all, the Debian SPARC port already requires sun4u hardware.
    
    Change-Id: Ic254622ae80ad65c9f545013b68d82665474402c

diff --git a/sal/osl/unx/asm/interlck_sparc.s b/sal/osl/unx/asm/interlck_sparc.s
index 8d86b4d..7b971a5 100644
--- a/sal/osl/unx/asm/interlck_sparc.s
+++ b/sal/osl/unx/asm/interlck_sparc.s
@@ -18,22 +18,10 @@
 
 
 /*
- * Implements osl_[increment|decrement]InterlockedCount in two ways:
- * sparcv8 architecture:                use the "swap" instruction
+ * Implements osl_[increment|decrement]InterlockedCount:
  * sparcv9/sparcv8plus architecture:    use the "cas"  instruction
  * 
- * 32 bit mode with v8 and v8plus support:
- * Initialize once with osl_InterlockedCountSetV9(int bv9) if you want to
- * use the "cas" instruction, which is faster (no spinlock needed)
- * Default is to use the "swap" instruction, which works on all supported
- * SPARC cpu's
- * 
- * osl_InterlockedCountSetV9(int bv9)
- *    bv9 = 0   use sparcv8 "swap" (spinlock)
- *    bv9 = 1   use sparcv9/sparcv8plus "cas" (no spinlock)
- *
- * 32 bit mode without v8 support (implies v8plus) or 64 bit mode:
- * No need (nor the possibilty) to call osl_InterlockedCountSetV9(), 
+ * 32 bit mode with v8plus support or 64 bit mode:
  * sparcv9 mode is implied. Assemble with -xarch=v8plus (32 bit) or
  * -xarch=v9 (64 bit).
  * 
@@ -41,181 +29,18 @@
 
 #if !defined(__sparcv8plus) && !defined(__sparcv9) && !defined(__sparc_v9__)
 
-.section ".data"
-.align 4
-osl_incrementInterLockCountFuncPtr:
-.word osl_incrementInterlockedCountV8
-.type osl_incrementInterLockCountFuncPtr,#object
-.size osl_incrementInterLockCountFuncPtr,4
-
-.align 4
-osl_decrementInterLockCountFuncPtr:
-.word osl_decrementInterlockedCountV8
-.type osl_decrementInterLockCountFuncPtr,#object
-.size osl_decrementInterLockCountFuncPtr,4
-
-.section   ".text"
-
-#if defined(NETBSD) || defined(LINUX)
-/* add the address of the calling "call" instruction (stored in %o7) to
- * %o5 which contains _GLOBAL_OFFSET_TABLE_
- */
-.Laddoseven:
-        retl
-        add %o7, %o5, %o5
-#endif
-
- .global   osl_incrementInterlockedCount
- .align   4
-
-osl_incrementInterlockedCount:
-
-#if defined(NETBSD) || defined(LINUX)
-        mov     %o7, %g1
-        sethi   %hi(_GLOBAL_OFFSET_TABLE_-4), %o5
-        call    .Laddoseven
-        add     %o5, %lo(_GLOBAL_OFFSET_TABLE_+4), %o5
-        mov     %g1, %o7
-#endif
-        set     osl_incrementInterLockCountFuncPtr, %o1
-#if defined(NETBSD)
-        ld      [%o1 + %o5], %o1
-#endif
-        ld      [%o1], %o1
-        jmp     %o1
-        nop                                             ! delay slot
- .type  osl_incrementInterlockedCount,#function
- .size  osl_incrementInterlockedCount,.-osl_incrementInterlockedCount
-
-.section   ".text"
- .global   osl_decrementInterlockedCount
- .align   4
-
-osl_decrementInterlockedCount:
+#error LibreOffice requires SPARCv8plus or SPARCv9 CPU with "cas" instruction
 
-#if defined(NETBSD) || defined(LINUX)
-        mov     %o7, %g1
-        sethi   %hi(_GLOBAL_OFFSET_TABLE_-4), %o5
-        call    .Laddoseven
-        add     %o5, %lo(_GLOBAL_OFFSET_TABLE_+4), %o5
-        mov     %g1, %o7
-#endif
-        set     osl_decrementInterLockCountFuncPtr, %o1
-#if defined(NETBSD) || defined(LINUX)
-        ld      [%o1 + %o5], %o1
-#endif
-        ld      [%o1], %o1
-        jmp     %o1
-        nop                                             ! delay slot
- .type  osl_decrementInterlockedCount,#function
- .size  osl_decrementInterlockedCount,.-osl_decrementInterlockedCount
-
-.section   ".text"
- .global   osl_InterlockedCountSetV9
- .align   4
-
-osl_InterlockedCountSetV9:
-
-#if defined(NETBSD) || defined(LINUX)
-        mov	    %o7, %g1
-        sethi	%hi(_GLOBAL_OFFSET_TABLE_-4), %o5
-        call	.Laddoseven
-        add	    %o5, %lo(_GLOBAL_OFFSET_TABLE_+4), %o5
-        mov	    %g1, %o7
-#endif
-        set     osl_incrementInterLockCountFuncPtr, %o1
-        set     osl_decrementInterLockCountFuncPtr, %o2
-        cmp     %o0, %g0
-        bnz     1f
-        nop                                             ! delay slot
-        set     osl_incrementInterlockedCountV8, %o0
-        set     osl_decrementInterlockedCountV8, %o3
-#if defined(NETBSD) || defined(LINUX)
-        ld      [%o0 + %o5], %o0
-        ld      [%o1 + %o5], %o1
-        ld      [%o2 + %o5], %o2
-        ld      [%o3 + %o5], %o3
 #endif
-        st      %o3,[%o2]
-        retl
-        st      %o0,[%o1]
-1:      set     osl_incrementInterlockedCountV9, %o0
-        set     osl_decrementInterlockedCountV9, %o3
-#if defined(NETBSD) || defined(LINUX)
-        ld      [%o0 + %o5], %o0
-        ld      [%o1 + %o5], %o1
-        ld      [%o2 + %o5], %o2
-        ld      [%o3 + %o5], %o3
-#endif
-        st      %o3,[%o2]
-        retl
-        st      %o0,[%o1]
-
- .type  osl_InterlockedCountSetV9,#function
- .size  osl_InterlockedCountSetV9,.-osl_InterlockedCountSetV9
- 
-
-.section   ".text"
- .local   osl_incrementInterlockedCountV8
- .align   4
-
-! Implements osl_[increment|decrement]InterlockedCount with sparcv8 "swap" instruction.
-! Uses -4096 as lock value for spinlock to allow for small negative counts.
-
-osl_incrementInterlockedCountV8:             
-
-1:      ld      [%o0], %o1
-        cmp     %o1, -4096          ! test spinlock
-        be      1b
-        mov     -4096, %o1          ! delay slot
-        swap    [%o0], %o1
-        cmp     %o1, -4096
-        be      1b
-        inc     %o1                 ! delay slot, if we got spinlock, increment count
-        st      %o1, [%o0]
-        retl
-        mov     %o1, %o0            ! delay slot
-
- .type  osl_incrementInterlockedCountV8,#function
- .size  osl_incrementInterlockedCountV8,.-osl_incrementInterlockedCountV8
-
-
-.section   ".text"
- .local osl_decrementInterlockedCountV8
- .align   4
-
-osl_decrementInterlockedCountV8:             
-
-1:      ld      [%o0], %o1
-        cmp     %o1, -4096          ! test spinlock
-        be      1b
-        mov     -4096, %o1          ! delay slot
-        swap    [%o0], %o1
-        cmp     %o1, -4096
-        be      1b
-        dec     %o1                 ! delay slot, if we got spinlock, decrement count
-        st      %o1, [%o0]          ! delay slot
-        retl
-        mov     %o1, %o0            ! delay slot
-
- .type  osl_decrementInterlockedCountV8,#function
- .size  osl_decrementInterlockedCountV8,.-osl_decrementInterlockedCountV8
-
-#endif /* !__sparcv8plus && !__sparcv9 && !_sparcv9__ */
 
 .section   ".text"
-#if defined(__sparcv8plus) || defined(__sparcv9) || defined(__sparc_v9__)
-#define   osl_incrementInterlockedCountV9 osl_incrementInterlockedCount
- .global  osl_incrementInterlockedCountV9
-#else
- .local   osl_incrementInterlockedCountV9
-#endif
+ .global  osl_incrementInterlockedCount
  .align   8
 
 !   Implements osl_[increment|decrement]InterlockedCount with sparcv9(sparcv8plus) "cas" 
 !   instruction.
 
-osl_incrementInterlockedCountV9:             
+osl_incrementInterlockedCount:
 
 1:      ld      [%o0], %o1
         add     %o1, 1, %o2
@@ -228,20 +53,15 @@ osl_incrementInterlockedCountV9:
         retl
         add     %o2, 1, %o0         ! delay slot
 
- .type  osl_incrementInterlockedCountV9,#function
- .size  osl_incrementInterlockedCountV9,.-osl_incrementInterlockedCountV9
+ .type  osl_incrementInterlockedCount,#function
+ .size  osl_incrementInterlockedCount,.-osl_incrementInterlockedCount
 
 
 .section   ".text"
-#if defined(__sparcv8plus) || defined(__sparcv9) || defined(__sparc_v9__)
-#define   osl_decrementInterlockedCountV9 osl_decrementInterlockedCount
- .global  osl_decrementInterlockedCountV9
-#else
- .local   osl_decrementInterlockedCountV9
-#endif
+ .global  osl_decrementInterlockedCount
  .align   8
 
-osl_decrementInterlockedCountV9:             
+osl_decrementInterlockedCount:
 
 1:      ld      [%o0], %o1
         sub     %o1, 1, %o2
@@ -254,5 +74,6 @@ osl_decrementInterlockedCountV9:
         retl
         sub     %o2, 1, %o0         ! delay slot
 
- .type  osl_decrementInterlockedCountV9,#function
- .size  osl_decrementInterlockedCountV9,.-osl_decrementInterlockedCountV9
+ .type  osl_decrementInterlockedCount,#function
+ .size  osl_decrementInterlockedCount,.-osl_decrementInterlockedCount
+
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 195bd4b..23e4f8c 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -288,99 +288,6 @@ char *fcvt(double value, int ndigit, int *decpt, int *sign)
 
 #endif
 
-#if defined (SPARC)
-
-#if defined (SOLARIS) && !defined(__sparcv8plus) && !defined(__sparcv9)
-#include <sys/types.h>
-#include <sys/processor.h>
-
-void osl_InterlockedCountSetV9(sal_Bool bV9);
-
-/*
- * osl_InitSparcV9() should be executed as early as possible. We place it in the
- * .init section of sal
- */
-#if defined ( __SUNPRO_C ) || defined ( __SUNPRO_CC )
-void osl_InitSparcV9(void);
-#pragma init (osl_InitSparcV9)
-#elif defined ( __GNUC__ )
-void osl_InitSparcV9(void)  __attribute__((constructor));
-#endif
-
-void osl_InitSparcV9(void)
-{
-    /* processor_info() identifies SPARCV8 (ie sun4c machines) simply as "sparc"
-     * and SPARCV9 (ie ultra sparcs, sun4u) as "sparcv9". Since we know that we
-     * run at least on a SPARCV8 architecture or better, any processor type != "sparc"
-     * and != "i386" is considered to be SPARCV9 or better
-     *
-     * This way we are certain that this will still work if someone names SPARCV10
-     * "foobar"
-     */
-    processor_info_t aInfo;
-    int rc;
-
-    rc = processor_info(0, &aInfo);
-
-    if ( rc != -1 ) {
-        if ( !strcmp( "sparc", aInfo.pi_processor_type )    /* SPARCV8 */
-            || !strcmp( "i386", aInfo.pi_processor_type ) ) /* can't happen, but ... */
-            return;
-        /* we are reasonably certain to be on sparcv9/sparcv8plus or better */
-        osl_InterlockedCountSetV9(sal_True);
-    }
-}
-
-#endif /* SOLARIS */
-
-#if defined(NETBSD) && defined(__GNUC__) && !defined(__sparcv9) && !defined(__sparc_v9__)
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-void osl_InitSparcV9(void)  __attribute__((constructor));
-void osl_InterlockedCountSetV9(sal_Bool bV9);
-
-/* Determine which processor we are running on (sparc v8 or v9)
- * The approach is very similar to Solaris.
- */
-
-void osl_InitSparcV9(void)
-{
-    int mib[2]={CTL_HW,HW_MACHINE};
-    char processorname[256];
-    size_t len=256;
-
-    /* get the machine name */
-    sysctl(mib, 2, processorname, &len, NULL, 0);
-    if (!strncmp("sparc64",processorname, len)) {
-        osl_InterlockedCountSetV9(sal_True);
-    }
-}
-
-#endif /* NETBSD */
-
-#endif /* SPARC */
-
-#if defined ( LINUX ) && defined ( SPARC )
-#include <sys/utsname.h>
-void osl_InitSparcV9(void)  __attribute__((constructor));
-void osl_InterlockedCountSetV9(sal_Bool bV9);
-/* Determine which processor we are running on (sparc v8 or v9)
- * The approach is very similar to Solaris.
- */
-void osl_InitSparcV9(void)
-{
-    struct utsname name;
-    int rc;
-    rc = uname(&name);
-    if ( rc != -1 ) {
-        if ( !strcmp( "sparc", name.machine ))
-        return;
-    osl_InterlockedCountSetV9(sal_True);
-    }
-}
-#endif
-
 #if    ( defined(__GNUC__) && (defined(X86) || defined(X86_64)) )\
     || ( defined(SOLARIS) && defined(__i386) )
 
commit e568d2ad00eaaf8b48420bc8e1ac32565d12baae
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 30 14:10:22 2013 +0200

    fontconfig: don't use gb_ExternalProject_use_packages directly
    
    Change-Id: I4ebe1a8caded065043db997e34d5d2b205fcca20

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f072148..423834e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
 
 endef
 
+gb_ExternalProject__use_freetype :=
+
 else ifeq ($(OS),ANDROID)
 
 define gb_LinkTarget__use_freetype_headers
@@ -1056,6 +1058,11 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers)
 
 endef
 
+define gb_ExternalProject__use_freetype
+$(call gb_ExternalProject_use_package,$(1),freetype)
+
+endef
+
 endif # SYSTEM_FREETYPE
 
 ifeq ($(SYSTEM_FONTCONFIG),YES)
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index 64ccbe6..a956e70 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,fontconfig))
 
-$(eval $(call gb_ExternalProject_use_packages,fontconfig,\
+$(eval $(call gb_ExternalProject_use_externals,fontconfig,\
 	expat \
 	freetype \
 ))


More information about the Libreoffice-commits mailing list