diff options
| author | jorton <jorton@fedoraproject.org> | 2006-06-02 13:57:39 +0000 |
|---|---|---|
| committer | jorton <jorton@fedoraproject.org> | 2006-06-02 13:57:39 +0000 |
| commit | 48593e589212ce165918f066a4e1189155884dca (patch) | |
| tree | aa7485da743f74b03f89858b8624c378f2fe9cfd /httpd-2.1.10-apxs.patch | |
| parent | 21e359146bab5bb0e76140f6dbad33325698f2f7 (diff) | |
| download | httpd-48593e589212ce165918f066a4e1189155884dca.tar.gz httpd-48593e589212ce165918f066a4e1189155884dca.tar.xz httpd-48593e589212ce165918f066a4e1189155884dca.zip | |
- make -devel package multilib-safe (#192686)httpd-2_2_2-4
Diffstat (limited to 'httpd-2.1.10-apxs.patch')
| -rw-r--r-- | httpd-2.1.10-apxs.patch | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/httpd-2.1.10-apxs.patch b/httpd-2.1.10-apxs.patch index 96d7c21..15afdeb 100644 --- a/httpd-2.1.10-apxs.patch +++ b/httpd-2.1.10-apxs.patch @@ -1,10 +1,28 @@ - remove unnecessary stuff which runs httpd during build - drop unnecessary --libs output from ap?-?-config +- make multilib-safe ---- httpd-2.1.10/support/apxs.in.apxs -+++ httpd-2.1.10/support/apxs.in -@@ -184,34 +184,6 @@ +--- httpd-2.2.2/support/apxs.in.apxs ++++ httpd-2.2.2/support/apxs.in +@@ -25,7 +25,15 @@ + + my %config_vars = (); + +-my $installbuilddir = "@exp_installbuilddir@"; ++# Awful hack to make apxs libdir-agnostic: ++my $pkg_config = "/usr/bin/pkg-config"; ++if (! -x "$pkg_config") { ++ error("$pkg_config not found!"); ++ exit(1); ++} ++ ++my $installbuilddir = `pkg-config --variable=libdir apr-1` . "httpd/build"; ++ + get_config_vars("$installbuilddir/config_vars.mk",\%config_vars); + + # read the configuration variables once +@@ -184,34 +192,6 @@ } } @@ -39,7 +57,7 @@ sub get_config_vars{ my ($file, $rh_config) = @_; -@@ -433,9 +405,9 @@ +@@ -433,9 +413,9 @@ if ($opt_p == 1) { |