diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-07-17 11:27:39 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-10-03 14:36:16 +0100 |
commit | 25ba859ab6ca18fb0391802a39300c408ab13420 (patch) | |
tree | 3d6b419afc8fffb8142b71ec943da9a312c39859 /meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch | |
parent | 520d3a14c999c52f30bb4e25c8f68e75a49663a7 (diff) | |
download | meta-openembedded-25ba859ab6ca18fb0391802a39300c408ab13420.tar.gz |
apache2: add from OE-Classic, update to version 2.4.2 and fix
* 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>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch new file mode 100644 index 0000000000..baa739fd44 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | # Author: echo <fei.geng@windriver.com> | ||
2 | # Date: April 28 2009 | ||
3 | # Summary:Fix perl install directory to /usr/bin | ||
4 | # | ||
5 | # Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | --- a/configure | ||
8 | +++ b/configure | ||
9 | @@ -22365,13 +22365,7 @@ | ||
10 | #define APACHE_MPM_DIR "$MPM_DIR" | ||
11 | _ACEOF | ||
12 | |||
13 | - | ||
14 | -perlbin=`$ac_aux_dir/PrintPath perl` | ||
15 | -if test "x$perlbin" = "x"; then | ||
16 | - perlbin="/replace/with/path/to/perl/interpreter" | ||
17 | -fi | ||
18 | - | ||
19 | - | ||
20 | +perlbin='/usr/bin/perl' | ||
21 | |||
22 | BSD_MAKEFILE=no | ||
23 | ap_make_include=include | ||
24 | --- a/configure.in | ||
25 | +++ b/configure.in | ||
26 | @@ -638,10 +638,7 @@ | ||
27 | AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", | ||
28 | [Location of the source for the current MPM]) | ||
29 | |||
30 | -perlbin=`$ac_aux_dir/PrintPath perl` | ||
31 | -if test "x$perlbin" = "x"; then | ||
32 | - perlbin="/replace/with/path/to/perl/interpreter" | ||
33 | -fi | ||
34 | +perlbin='/usr/bin/perl' | ||
35 | AC_SUBST(perlbin) | ||
36 | |||
37 | dnl If we are running on BSD/OS, we need to use the BSD .include syntax. | ||