summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-01-12 16:52:45 +0000
committerPaul Eggleton <paul.eggleton@linux.intel.com>2014-03-06 12:12:14 +0000
commit50f28a183f30c82280510988ad456f456e2c82ea (patch)
tree0055c7fdd9bda2fa91f592a2b7e8b92e003911f5 /meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch
parent279ebafb9dfcc3bd5095f4880e16a2e9401e38f7 (diff)
downloadmeta-openembedded-50f28a183f30c82280510988ad456f456e2c82ea.tar.gz
apache2: update to 2.4.7
* LIC_FILES_CHKSUM changed because of the introduction of an extra blank line in the LICENSE file (!) * Refreshed TLS Next Protocol Negotiation support patch for conflict with 2.4.7. Thanks to Hongxu Jia for doing this work. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch')
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch
deleted file mode 100644
index baa739fd44..0000000000
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch
+++ /dev/null
@@ -1,37 +0,0 @@
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.