external/glew/ExternalProject_glew.mk | 2 +-
external/glew/UnpackedTarball_glew.mk | 1 +
external/glew/glew-ar-lto.patch.1 | 28 ++++++++++++++++++++++++++++
external/openssl/ExternalProject_openssl.mk | 1 +
4 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 1c1b788f38da07aed268be3c515a096594a107dc
Author: Peter Foley <pefol...@pefoley.com>
Date: Tue Jan 19 14:48:49 2016 -0500
More LTO fixes for android
Change-Id: Id9b4873b8213d9913d54b3821ba0be6ffa7ac188
Reviewed-on: https://gerrit.libreoffice.org/21612
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/external/glew/ExternalProject_glew.mk
b/external/glew/ExternalProject_glew.mk
index bb78dce..a26a0c6 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -27,7 +27,7 @@ else
$(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,glew,\
- $(if $(ENABLE_DEBUG),STRIP=) LD="$(CC)" \
+ $(if $(ENABLE_DEBUG),STRIP=) LD="$(CC)" AR_FLAGS="$(AR_FLAGS)" \
$(MAKE) STRIP= glew.lib $(if $(filter
DESKTOP,$(BUILD_TYPE)),$(if $(ENABLE_DEBUG),debug)) \
)
diff --git a/external/glew/UnpackedTarball_glew.mk
b/external/glew/UnpackedTarball_glew.mk
index 3b1a5a1..4911178 100644
--- a/external/glew/UnpackedTarball_glew.mk
+++ b/external/glew/UnpackedTarball_glew.mk
@@ -38,6 +38,7 @@ endif
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,glew,\
external/glew/glew-static-only.patch.1 \
+ external/glew/glew-ar-lto.patch.1 \
))
endif
diff --git a/external/glew/glew-ar-lto.patch.1
b/external/glew/glew-ar-lto.patch.1
new file mode 100644
index 0000000..36af0a0f
--- /dev/null
+++ b/external/glew/glew-ar-lto.patch.1
@@ -0,0 +1,28 @@
+--- a/Makefile.orig 2016-01-19 14:38:00.124312444 -0500
++++ b/Makefile 2016-01-19 14:39:00.728011296 -0500
+@@ -67,6 +67,7 @@
+ # - use LN= on gmake command-line
+
+ AR ?= ar
++AR_FLAGS ?= cr
+ INSTALL ?= install
+ STRIP ?= strip
+ RM ?= rm -f
+@@ -106,7 +107,7 @@
+ mkdir lib
+
+ lib/$(LIB.STATIC): $(LIB.OBJS)
+- $(AR) cr $@ $^
++ $(AR) $(AR_FLAGS) $@ $^
+ ifneq ($(STRIP),)
+ $(STRIP) -x $@
+ endif
+@@ -150,7 +151,7 @@
+ glew.lib.mx: lib lib/$(LIB.SHARED.MX) lib/$(LIB.STATIC.MX) glewmx.pc
+
+ lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX)
+- $(AR) cr $@ $^
++ $(AR) $(AR_FLAGS) $@ $^
+
+ lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX)
+ $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
diff --git a/external/openssl/ExternalProject_openssl.mk
b/external/openssl/ExternalProject_openssl.mk
index c22ec7b..43384aa 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -87,6 +87,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
$(if $(SYSBASE),-I$(SYSBASE)/usr/include
-L$(SYSBASE)/usr/lib)) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
&& $(MAKE) build_libs \
+ AR="$(AR) $(AR_FLAGS)" \
CC="$(CC) -fPIC $(if $(filter-out WNT MACOSX,$(OS)),\
$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
-fvisibility=hidden))" \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
