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/httpd-2.4.1-export.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/httpd-2.4.1-export.patch')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-export.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-export.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-export.patch new file mode 100644 index 0000000000..ed629bfc81 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-export.patch | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | |||
| 2 | There is no need to "suck in" the apr/apr-util symbols when using | ||
| 3 | a shared libapr{,util}, it just bloats the symbol table; so don't. | ||
| 4 | |||
| 5 | Upstream-HEAD: needed | ||
| 6 | Upstream-2.0: omit | ||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Note: EXPORT_DIRS change is conditional on using shared apr | ||
| 10 | |||
| 11 | --- httpd-2.4.1/server/Makefile.in.export | ||
| 12 | +++ httpd-2.4.1/server/Makefile.in | ||
| 13 | @@ -57,9 +57,6 @@ export_files: | ||
| 14 | ( for dir in $(EXPORT_DIRS); do \ | ||
| 15 | ls $$dir/*.h ; \ | ||
| 16 | done; \ | ||
| 17 | - for dir in $(EXPORT_DIRS_APR); do \ | ||
| 18 | - ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \ | ||
| 19 | - done; \ | ||
| 20 | ) | sort -u > $@ | ||
| 21 | |||
| 22 | exports.c: export_files | ||
