[Libreoffice-commits] .: 2 commits - binfilter lcms2/ExternalPackage_lcms2.mk lcms2/ExternalProject_lcms2.mk

[Libreoffice Gerrit user]

 binfilter                      |    1 -
 lcms2/ExternalPackage_lcms2.mk |    2 +-
 lcms2/ExternalProject_lcms2.mk |    4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 0aa1baa80b439740f176249d4f05007f715cf2b0
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Nov 9 09:27:19 2012 +0100

    Trying to fix lcms2 again
    
    Change-Id: I376b03d12f8ae59fcf75046c42bcd6ba5d29af2c

diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index 1d62736..1500476 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms
 else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2.dll,src/.libs/liblcms2.dll))
+$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
 else ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2.lib,bin/lcms2.lib))
 $(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2.dll))
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
index 2703c38..c2fd878 100644
--- a/lcms2/ExternalProject_lcms2.mk
+++ b/lcms2/ExternalProject_lcms2.mk
@@ -34,9 +34,9 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
 	cd $(EXTERNAL_WORKDIR) \
 	&& ./configure --without-jpeg --without-tiff --with-pic \
 	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-	$(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--export-all-symbols -Wl,--enable-stdcall-fixup -Wl,--enable-runtime-pseudo-reloc-v2") \
 	CPPFLAGS=" $(SOLARINC)" \
-	$(if $(filter IOS ANDROID,$(OS)),--disable-shared, --enable-shared --disable-static) \
+	$(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \
+	$(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \
 	&& cd src \
 	&& $(MAKE) \
 	&& touch $@
commit 0f25bad134dbd103c614b1299e800e3be22d5e0d
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Nov 9 09:27:04 2012 +0100

    fix binfilter removal

diff --git a/binfilter b/binfilter
deleted file mode 160000
index 63f492b..0000000
--- a/binfilter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63f492b8333f5994294c8ea88fd8c5aa163ec6ff