[packages/php/PHP_5_6] pass --tag CC to libtool

glen glen at pld-linux.org
Thu Aug 21 22:56:47 CEST 2014


commit 8b15d51cb0e6c95aaa43d886ff122e7c97ff2c24
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 21 23:56:20 2014 +0300

    pass --tag CC to libtool

 libtool-tag.patch | 12 ++++++++++++
 php.spec          |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/php.spec b/php.spec
index c62f109..57af378 100644
--- a/php.spec
+++ b/php.spec
@@ -177,7 +177,7 @@ Patch5:		%{orgname}-filter-shared.patch
 Patch6:		%{orgname}-build_modules.patch
 Patch7:		%{orgname}-sapi-ini-file.patch
 Patch8:		milter.patch
-
+Patch9:		libtool-tag.patch
 Patch10:	%{orgname}-ini.patch
 Patch11:	embed.patch
 %if %{with type_hints}
@@ -1932,7 +1932,7 @@ cp -p php.ini-production php.ini
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-
+%patch9 -p1
 %patch10 -p1
 %if %{with type_hints}
 %patch12 -p0
diff --git a/libtool-tag.patch b/libtool-tag.patch
new file mode 100644
index 0000000..951fd1e
--- /dev/null
+++ b/libtool-tag.patch
@@ -0,0 +1,12 @@
+--- php-5.6.0RC4/configure.in~	2014-08-20 16:08:27.000000000 +0300
++++ php-5.6.0RC4/configure.in	2014-08-21 20:49:14.693072513 +0300
+@@ -1408,6 +1408,9 @@
+ dnl libtool 1.4.3 needs this.
+ PHP_SET_LIBTOOL_VARIABLE([--preserve-dup-deps])
+ 
++dnl pass --tag=CC to unconfuse when CC="ccache gcc"
++PHP_SET_LIBTOOL_VARIABLE([--tag=CC])
++
+ test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
+ test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
+ SHARED_LIBTOOL='$(LIBTOOL)'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/8b15d51cb0e6c95aaa43d886ff122e7c97ff2c24



More information about the pld-cvs-commit mailing list