[libreoffice/f21] Related: rhbz#1150048 rpmdiff: propagate CFLAGS to redland build

[David Tardon]

commit 292cc2382804b6045cf44a440336b211a85b0741
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Feb 6 12:36:17 2015 +0100

    Related: rhbz#1150048 rpmdiff: propagate CFLAGS to redland build
    
    (cherry picked from commit 11d0b74e87f55a90a788468663860405da9e91c5)

 0002-propagate-user-set-CFLAGS-to-build.patch | 54 +++++++++++++++++++++++++++
 libreoffice.spec                              |  1 +
 2 files changed, 55 insertions(+)
---
diff --git a/0002-propagate-user-set-CFLAGS-to-build.patch b/0002-propagate-user-set-CFLAGS-to-build.patch
new file mode 100644
index 0000000..92840ab
--- /dev/null
+++ b/0002-propagate-user-set-CFLAGS-to-build.patch
@@ -0,0 +1,54 @@
+From d156d513869d1e0634e981c85860c3a08b18d093 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 5 Feb 2015 15:46:58 +0100
+Subject: [PATCH 2/2] propagate user-set CFLAGS to build
+
+Change-Id: I9d72270ddd8698b776b80d4cca0a23f2ebda066a
+---
+ external/redland/ExternalProject_raptor.mk  | 2 +-
+ external/redland/ExternalProject_rasqal.mk  | 2 +-
+ external/redland/ExternalProject_redland.mk | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
+index 70d6fe7..8f2a6d5 100644
+--- a/external/redland/ExternalProject_raptor.mk
++++ b/external/redland/ExternalProject_raptor.mk
+@@ -35,7 +35,7 @@ else
+ $(call gb_ExternalProject_get_state_target,raptor,build):
+ 	$(call gb_ExternalProject_run,build,\
+ 		$(if $(filter IOS,$(OS)),LIBS="-liconv") \
+-		CFLAGS="$(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
++		CFLAGS="$(CFLAGS) $(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
+ 			$(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \
+ 		LDFLAGS=" \
+ 			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
+diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
+index 6b695de..1f373ce 100644
+--- a/external/redland/ExternalProject_rasqal.mk
++++ b/external/redland/ExternalProject_rasqal.mk
+@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
+ else
+ $(call gb_ExternalProject_get_state_target,rasqal,build):
+ 	$(call gb_ExternalProject_run,build,\
+-		CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
++		CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
+ 		LDFLAGS=" \
+ 			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
+ 			$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
+diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
+index 9b96c9c..872384b 100644
+--- a/external/redland/ExternalProject_redland.mk
++++ b/external/redland/ExternalProject_redland.mk
+@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
+ else
+ $(call gb_ExternalProject_get_state_target,redland,build):
+ 	$(call gb_ExternalProject_run,build,\
+-		CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
++		CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
+ 		LDFLAGS=" \
+ 			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
+ 			$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
+-- 
+2.1.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 6e8dfa6..364b87d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -371,6 +371,7 @@ Patch73: 0001-Resolves-fdo-84887-TabBar-ImplShowPage-crash.patch
 Patch74: 0001-Resolves-rhbz-1193971-clear-hard-coded-char-props-in.patch
 Patch75: 0001-add-accel.-to-switch-monitors-to-pres.-console.patch
 Patch76: 0001-build-libetonyek-with-no-strict-aliasing.patch
+Patch77: 0002-propagate-user-set-CFLAGS-to-build.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice