[Libreoffice-commits] core.git: 3 commits - cppunit/ExternalPackage_cppunit.mk icu/ExternalProject_icu.mk

[David Tardon]

 cppunit/ExternalPackage_cppunit.mk |    2 +-
 icu/ExternalProject_icu.mk         |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 92b963ef5f7aa8f1bbacd1803f6e066bf1394b8d
Author: David Tardon <dtar...@redhat.com>
Date:   Fri Mar 15 16:04:29 2013 +0100

    @touch does not exist
    
    Change-Id: Ic81a31d738bedcd6a35eb42d365dacc2af7ebe93

diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index 7525080..aea42c0 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
                        --enable-layout --disable-static --enable-shared 
--disable-samples \
                && $(MAKE) \
                &&  for lib in icudata icuin icuuc icule icutu; do \
-                       @touch $$lib; \
+                       touch $$lib; \
                        done \
        ,source)
 endif
commit 02bb492622ddba085481426a52d0c273381d7404
Author: David Tardon <dtar...@redhat.com>
Date:   Fri Mar 15 16:03:54 2013 +0100

    add missing \
    
    Change-Id: I9df137849a628089eb03b714d5f61e8d4084be17

diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index 610b510..7525080 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
                LIBS="$(if $(filter 
YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
                LDFLAGS="-L$(COMPATH)/lib 
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 \
                                $(if $(filter 
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-               ./configure
+               ./configure \
                        $(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
                        --with-cross-build=$(subst 
$(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \
                        --enable-layout --disable-static --enable-shared 
--disable-samples \
commit 930fe0581794e2ae6aaa62c2c716ed655a0f2885
Author: David Tardon <dtar...@redhat.com>
Date:   Fri Mar 15 15:11:48 2013 +0100

    fix library name
    
    Change-Id: I70dd4c9a54af8b6eeeaa6b075c5e54e296c670f1

diff --git a/cppunit/ExternalPackage_cppunit.mk 
b/cppunit/ExternalPackage_cppunit.mk
index d5f3f53..6ebe243 100644
--- a/cppunit/ExternalPackage_cppunit.mk
+++ b/cppunit/ExternalPackage_cppunit.mk
@@ -17,7 +17,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppun
 $(eval $(call 
gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/ReleaseDll/DllPlugInTester_dll.exe))
 else
 $(eval $(call 
gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll))
-$(eval $(call 
gb_ExternalPackage_add_file,cppunit,lib/cppunit.dll.a,src/cppunit/.libs/cppunit.dll.a))
+$(eval $(call 
gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dll.a,src/cppunit/.libs/libcppunit.dll.a))
 $(eval $(call 
gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/.libs/DllPlugInTester.exe))
 endif
 else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits