commit 9902776839acd78e9b6594eb21f3578d13e2c9ef
Author: Elan Ruusamäe <[email protected]>
Date: Fri Sep 11 16:17:31 2015 +0300
update more places to add libtool --tag=CC
apache.spec | 2 +-
libtool-tag.patch | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/apache.spec b/apache.spec
index 694be9d..1af40c4 100644
--- a/apache.spec
+++ b/apache.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8): Самый популярный веб-сервер
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
Version: 2.4.16
-Release: 2
+Release: 3
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
diff --git a/libtool-tag.patch b/libtool-tag.patch
index 03a7be2..ff8fcb0 100644
--- a/libtool-tag.patch
+++ b/libtool-tag.patch
@@ -34,3 +34,38 @@
#
# Dependencies
+--- httpd-2.4.16/support/Makefile.in 2015-09-11 16:11:56.135519322 +0300
++++ httpd-2.4.16/support/Makefile.in 2015-09-11 16:16:16.075587666 +0300
+@@ -62,10 +62,10 @@
+ ab_OBJECTS = ab.lo
+ ab_LDADD = $(PROGRAM_LDADD) $(MATH_LIBS)
+ ab.lo: ab.c
+- $(LIBTOOL) --mode=compile $(CC) $(ab_CFLAGS) $(ALL_CFLAGS)
$(ALL_CPPFLAGS) \
++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(ab_CFLAGS) $(ALL_CFLAGS)
$(ALL_CPPFLAGS) \
+ $(ALL_INCLUDES) $(PICFLAGS) $(LTCFLAGS) -c $< && touch $@
+ ab: $(ab_OBJECTS)
+- $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(ab_LDFLAGS) $(PILDFLAGS) \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(ab_LDFLAGS)
$(PILDFLAGS) \
+ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(ab_LTFLAGS) $(ab_OBJECTS)
$(ab_LDADD)
+
+ checkgid_OBJECTS = checkgid.lo
+--- httpd-2.4.16/support/apxs.in~ 2015-09-11 16:01:29.000000000 +0300
++++ httpd-2.4.16/support/apxs.in 2015-09-11 16:02:27.246251056 +0300
+@@ -430,7 +430,7 @@
+ $la =~ s|\.c$|.la|;
+ my $o = $s;
+ $o =~ s|\.c$|.o|;
+- push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags
-I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch
$slo");
++ push(@cmds, "$libtool $ltflags --mode=compile --tag=CC $CFG_CC
$cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s &&
touch $slo");
+ unshift(@objs, $lo);
+ }
+
+@@ -471,7 +471,7 @@
+ $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
+ }
+
+- push(@cmds, "$libtool $ltflags --mode=link $CFG_CC $ldflags -o $dso_file
$opt $lo");
++ push(@cmds, "$libtool $ltflags --mode=link --tag=CC $CFG_CC $ldflags -o
$dso_file $opt $lo");
+
+ # execute the commands
+ &execute_cmds(@cmds);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/9902776839acd78e9b6594eb21f3578d13e2c9ef
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
