[Libreoffice-commits] core.git: external/glew external/openssl

[Tor Lillqvist]

 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, 1 insertion(+), 31 deletions(-)

New commits:
commit 05b44143d2300d025d6112b8986ac6965ef844c0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jan 22 06:48:28 2016 +0000

    Revert "More LTO fixes for android"
    
    Seems to cause tinderbox build breakage, sigh.
    
    This reverts commit 1c1b788f38da07aed268be3c515a096594a107dc.
    
    Change-Id: I5a69e186e0f8f71c2fcc81d27bebe2253fd240bb
    Reviewed-on: https://gerrit.libreoffice.org/21699
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk
index a26a0c6..bb78dce 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)" AR_FLAGS="$(AR_FLAGS)" \
+		$(if $(ENABLE_DEBUG),STRIP=) LD="$(CC)" \
 			$(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 4911178..3b1a5a1 100644
--- a/external/glew/UnpackedTarball_glew.mk
+++ b/external/glew/UnpackedTarball_glew.mk
@@ -38,7 +38,6 @@ 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
deleted file mode 100644
index 36af0a0f..0000000
--- a/external/glew/glew-ar-lto.patch.1
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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 43384aa..c22ec7b 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -87,7 +87,6 @@ $(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))" \