Version 2.4.62

[ihttpd] / SOURCES / httpd-2.4.9-apxs.patch

diff --git a/SOURCES/httpd-2.4.9-apxs.patch b/SOURCES/httpd-2.4.9-apxs.patch
index 7016dec1d4b9a3f460e94b6b82cf6d8349a43a1a..e2b65f77485dac94cd8e14d34ea00f5723e88a98 100644 (file)
--- a/SOURCES/httpd-2.4.9-apxs.patch
+++ b/SOURCES/httpd-2.4.9-apxs.patch
@@ -1,8 +1,6 @@
-diff --git a/support/apxs.in b/support/apxs.in
-index ad1287f..efcfcf6 100644
---- a/support/apxs.in
-+++ b/support/apxs.in
-@@ -25,7 +25,18 @@ package apxs;
+--- httpd-2.4.43/support/apxs.in.apxs  2020-03-20 15:00:44.000000000 +0200
++++ httpd-2.4.43/support/apxs.in       2020-04-02 15:16:23.516349733 +0300
+@@ -35,7 +35,18 @@

  
  my %config_vars = ();
  
  
  my %config_vars = ();
  


@@ -19,10 +17,10 @@ index ad1287f..efcfcf6 100644
 +
 +my $installbuilddir = $libdir . "/httpd/build";
 +
 +
 +my $installbuilddir = $libdir . "/httpd/build";
 +

- get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
+ get_config_vars($destdir . "$installbuilddir/config_vars.mk",\%config_vars);

  
  # read the configuration variables once
  
  # read the configuration variables once

-@@ -275,7 +286,7 @@ if ($opt_g) {
+@@ -285,7 +296,7 @@

      $data =~ s|%NAME%|$name|sg;
      $data =~ s|%TARGET%|$CFG_TARGET|sg;
      $data =~ s|%PREFIX%|$prefix|sg;
      $data =~ s|%NAME%|$name|sg;
      $data =~ s|%TARGET%|$CFG_TARGET|sg;
      $data =~ s|%PREFIX%|$prefix|sg;


@@ -31,7 +29,7 @@ index ad1287f..efcfcf6 100644
  
      my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
  
  
      my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
  

-@@ -453,11 +464,11 @@ if ($opt_c) {
+@@ -463,11 +474,11 @@

      my $ldflags = "$CFG_LDFLAGS";
      if ($opt_p == 1) {
          
      my $ldflags = "$CFG_LDFLAGS";
      if ($opt_p == 1) {
          


@@ -45,7 +43,7 @@ index ad1287f..efcfcf6 100644
              chomp($apu_libs);
          }
          
              chomp($apu_libs);
          }
          

-@@ -672,8 +683,8 @@ __DATA__
+@@ -682,8 +693,8 @@

  
  builddir=.
  top_srcdir=%PREFIX%
  
  builddir=.
  top_srcdir=%PREFIX%