diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2016-01-19 14:48:49 -0500 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-22 06:35:41 +0000 |
| commit | 1c1b788f38da07aed268be3c515a096594a107dc (patch) | |
| tree | 4f00273a49ce777b04c70c32ada6c31574a4b6f2 /external/glew | |
| parent | lotuswordpro: Clean after we use constructor feature (diff) | |
| download | core-1c1b788f38da07aed268be3c515a096594a107dc.tar.gz core-1c1b788f38da07aed268be3c515a096594a107dc.zip | |
More LTO fixes for android
Change-Id: Id9b4873b8213d9913d54b3821ba0be6ffa7ac188
Reviewed-on: https://gerrit.libreoffice.org/21612
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'external/glew')
| -rw-r--r-- | external/glew/ExternalProject_glew.mk | 2 | ||||
| -rw-r--r-- | external/glew/UnpackedTarball_glew.mk | 1 | ||||
| -rw-r--r-- | external/glew/glew-ar-lto.patch.1 | 28 |
3 files changed, 30 insertions, 1 deletions
diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index bb78dce2977e..a26a0c6a4dee 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 3b1a5a187361..491117860d57 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 000000000000..36af0a0f39f5 --- /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) |