apache2 httpd 2.4.2

[Bjarne D Mathiesen]

Ryan Schmidt wrote:
> 
> On Apr 27, 2012, at 16:55, Bjarne D Mathiesen wrote:
> 
>> How about the libtool patch ???
>> https://issues.apache.org/bugzilla/show_bug.cgi?id=47691
>> this is a patch that's been made exclusively by macports
> 
> If equivalent changes have not been made in the apache source already (and I guess they haven't because the upstream bug report has not been touched) then yes the patch is still necessary.

OK - these changes haven't been made in the source code so we'll still
need this patch

This patch pathces 3 (three) files :

build/rules.mk.in
a change in the line-numbers is all that's necessary

srclib/apr/configure
this file is no longer present i the 2.4.2 source code & I've been
unable to find something similar to it elsewhere in the source code.
I've thus removed this patch from the file

build/rules.mk.in
a change in the line-numbers is all that's necessary


-- 
Bjarne D Mathiesen
København N ; Danmark ; Europa
----------------------------------------------------------------------
denne besked er skrevet i et totalt M$-frit miljø
MacOS X 10.7.3 Lion ; 2.8GHz Intel Core i7 ; 16GB 1067MHz DDR3
-------------- next part --------------
https://issues.apache.org/bugzilla/show_bug.cgi?id=47691
--- build/rules.mk.in.orig	2006-07-12 05:38:44.000000000 +0200
+++ build/rules.mk.in	2009-08-12 18:08:08.000000000 +0200
@@ -38,17 +38,17 @@
 COMPILE      = $(BASE_CC) @PICFLAGS@
 CXX_COMPILE  = $(BASE_CXX) @PICFLAGS@
 
-SH_COMPILE     = $(LIBTOOL) --mode=compile $(BASE_CC) @SHLTCFLAGS@ -c $< && touch $@
-SH_CXX_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CXX) @SHLTCFLAGS@ -c $< && touch $@
+SH_COMPILE     = $(LIBTOOL) --mode=compile --tag=CC $(BASE_CC) @SHLTCFLAGS@ -c $< && touch $@
+SH_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(BASE_CXX) @SHLTCFLAGS@ -c $< && touch $@
 
-LT_COMPILE     = $(LIBTOOL) --mode=compile $(COMPILE) @LTCFLAGS@ -c $< && touch $@
-LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) @LTCFLAGS@ -c $< && touch $@
+LT_COMPILE     = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) @LTCFLAGS@ -c $< && touch $@
+LT_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX_COMPILE) @LTCFLAGS@ -c $< && touch $@
 
 # Link-related commands
 
-LINK     = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) @PILDFLAGS@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-SH_LINK  = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
-MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+LINK     = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) @PILDFLAGS@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+SH_LINK  = $(SH_LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
+MOD_LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 
 # Cross compile commands
 
@@ -225,7 +225,7 @@
 
 # Makes an import library from a def file
 .def.la:
-	$(LIBTOOL) --mode=compile $(MK_IMPLIB) -o $@ $<
+	$(LIBTOOL) --mode=compile --tag=CC $(MK_IMPLIB) -o $@ $<
 
 #
 # Dependencies
--- support/apxs.in.orig	2010-05-10 15:02:56.000000000 -0500
+++ support/apxs.in	2011-10-20 23:37:00.000000000 -0500
@@ -426,7 +426,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);
     }
 
@@ -466,7 +466,7 @@
         $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
     }
 
-    push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
+    push(@cmds, "$libtool $ltflags --mode=link --tag=CC $CFG_CC -o $dso_file $opt $lo");
 
     #   execute the commands
     &execute_cmds(@cmds);