mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 17:59:59 +00:00
Paul Eggleton
25ba859ab6
* Enable threading for PHP * Backport a number of patches * Use apachectl in init script * Install modules into a sane location * Ensure apxs script is installed into sysroot in crossscripts directory and modified so that it works for building PHP * Install httpd executable for native version so that PHP configure script can call it * Rename server-makefile-patch to server-makefile.patch and drop apply=yes * Add LIC_FILES_CHKSUM * Fix packaging QA warnings * Add LSB headers to init script * Clean out some cruft and move packaging stuff after do_install Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
Fix build scripts to use correct libtool filename
|
|
|
|
Upstream-Status: Inappropriate [configuration]
|
|
|
|
---
|
|
httpd-2.4.2/build/config_vars.sh.in | 2 +-
|
|
httpd-2.4.2/configure | 2 +-
|
|
httpd-2.4.2/configure.in | 2 +-
|
|
httpd-2.4.2/support/apxs.in | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/build/config_vars.sh.in
|
|
+++ b/build/config_vars.sh.in
|
|
@@ -35,7 +35,7 @@ else
|
|
APU_CONFIG=@APU_CONFIG@
|
|
fi
|
|
|
|
-APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`"
|
|
+APR_LIBTOOL="`${APR_CONFIG} --apr-libtool | sed -e s,libtool,${host_alias}-libtool,`"
|
|
APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"
|
|
test -n "@APU_CONFIG@" && APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
|
|
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6205,7 +6205,7 @@ case $host in
|
|
if test "x$LTFLAGS" = "x"; then
|
|
LTFLAGS='--silent'
|
|
fi
|
|
- my_libtool=`$apr_config --apr-libtool`
|
|
+ my_libtool=`$apr_config --apr-libtool | sed -e s,libtool,${host_alias}-libtool,`
|
|
LIBTOOL="$my_libtool \$(LTFLAGS)"
|
|
libtoolversion=`$my_libtool --version`
|
|
case $libtoolversion in
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -264,7 +264,7 @@ case $host in
|
|
if test "x$LTFLAGS" = "x"; then
|
|
LTFLAGS='--silent'
|
|
fi
|
|
- my_libtool=`$apr_config --apr-libtool`
|
|
+ my_libtool=`$apr_config --apr-libtool | sed -e s,libtool,${host_alias}-libtool,`
|
|
LIBTOOL="$my_libtool \$(LTFLAGS)"
|
|
libtoolversion=`$my_libtool --version`
|
|
case $libtoolversion in
|
|
--- a/support/apxs.in
|
|
+++ b/support/apxs.in
|
|
@@ -352,7 +352,7 @@ if ($apr_major_version < 2) {
|
|
}
|
|
}
|
|
|
|
-my $libtool = `$apr_config --apr-libtool`;
|
|
+my $libtool = `$apr_config --apr-libtool| sed -e s,libtool,${host_alias}-libtool,`;
|
|
chomp($libtool);
|
|
|
|
my $apr_includedir = `$apr_config --includes`;
|