apxs: Don't pass --silent to libtool

2 files changed, 23 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 8ecad70c..c1ea973a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 apache2 (2.4.16-3) UNRELEASED; urgency=medium
 
+  [ Jean-Michel Vourgère ]
   * Have apache2.postrm removes content of /var/lib/apache2, not the
     directory itself. Closes: #793862
   * d/p/reproducible_builds.diff: Sort exported symbols list.
 
+  [ Stefan Fritsch ]
+  * apxs: Don't pass --silent to libtool. Closes: #795820
+
  -- Jean-Michel Vourgère <nirgal@debian.org>  Tue, 11 Aug 2015 11:12:04 +0200
 
 apache2 (2.4.16-2) unstable; urgency=medium
diff --git a/debian/patches/customize_apxs.patch b/debian/patches/customize_apxs.patch
index 7ccca92b..5b580276 100644
--- a/debian/patches/customize_apxs.patch
+++ b/debian/patches/customize_apxs.patch
@@ -6,9 +6,9 @@ Forwarded: not-needed
 Author: Stefan Fritsch <sf@debian.org>
 Last-Update: 2012-03-17
 
---- a/support/apxs.in
-+++ b/support/apxs.in
-@@ -38,7 +38,7 @@
+--- apache2.orig/support/apxs.in
++++ apache2/support/apxs.in
+@@ -38,7 +38,7 @@ my $localstatedir  = get_vars("localstat
  my $CFG_TARGET     = get_vars("progname");
  my $CFG_SYSCONFDIR = get_vars("sysconfdir");
  my $CFG_CFLAGS     = join ' ', map { get_vars($_) }
@@ -17,7 +17,16 @@ Last-Update: 2012-03-17
  my $CFG_LDFLAGS    = join ' ', map { get_vars($_) }
    qw(LDFLAGS NOTEST_LDFLAGS SH_LDFLAGS);
  my $includedir     = get_vars("includedir");
-@@ -276,6 +276,7 @@
+@@ -49,7 +49,7 @@ my $CFG_LIBEXECDIR = eval qq("$libexecdi
+ my $sbindir        = get_vars("sbindir");
+ my $CFG_SBINDIR    = eval qq("$sbindir");
+ my $ltflags        = $ENV{'LTFLAGS'};
+-$ltflags or $ltflags = "--silent";
++$ltflags or $ltflags = "";
+ 
+ my %internal_vars = map {$_ => 1}
+     qw(TARGET CC CFLAGS CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB
+@@ -276,6 +276,7 @@ if ($opt_g) {
      $data =~ s|%TARGET%|$CFG_TARGET|sg;
      $data =~ s|%PREFIX%|$prefix|sg;
      $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
@@ -25,7 +34,7 @@ Last-Update: 2012-03-17
  
      my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
  
-@@ -428,7 +429,7 @@
+@@ -428,7 +429,7 @@ if ($opt_c) {
          $la =~ s|\.c$|.la|;
          my $o = $s;
          $o =~ s|\.c$|.o|;
@@ -34,7 +43,7 @@ Last-Update: 2012-03-17
          unshift(@objs, $lo);
      }
  
-@@ -469,7 +470,7 @@
+@@ -469,7 +470,7 @@ if ($opt_c) {
          $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
      }
  
@@ -43,7 +52,7 @@ Last-Update: 2012-03-17
  
      #   execute the commands
      &execute_cmds(@cmds);
-@@ -503,7 +504,7 @@
+@@ -503,7 +504,7 @@ if ($opt_i or $opt_e) {
          if ($opt_i) {
  	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
                   "$libtool' $f $CFG_LIBEXECDIR");
@@ -52,7 +61,7 @@ Last-Update: 2012-03-17
          }
  
          #   determine module symbolname and filename
-@@ -539,10 +540,11 @@
+@@ -539,10 +540,11 @@ if ($opt_i or $opt_e) {
              $filename = "mod_${name}.c";
          }
          my $dir = $CFG_LIBEXECDIR;
@@ -66,7 +75,7 @@ Last-Update: 2012-03-17
      }
  
      #   execute the commands
-@@ -550,108 +552,35 @@
+@@ -550,108 +552,35 @@ if ($opt_i or $opt_e) {
  
      #   activate module via LoadModule/AddModule directive
      if ($opt_a or $opt_A) {
@@ -198,7 +207,7 @@ Last-Update: 2012-03-17
      }
  }
  
-@@ -671,8 +600,8 @@
+@@ -671,8 +600,8 @@ __DATA__
  ##
  
  builddir=.