diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-04-25 15:15:28 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-04-29 10:13:56 -0700 |
commit | a687e017604db0f00a2c486b52825e75f9dd48ee (patch) | |
tree | 441417c448f7410d0548071d2baa976d081e632a /meta-webserver | |
parent | d96b0bd015c6089edb2fc520447ed0f881bc95f3 (diff) | |
download | meta-openembedded-a687e017604db0f00a2c486b52825e75f9dd48ee.tar.gz |
apache2: add back patch for set perlbin
Add back this patch. Without this patch, apxs's shebang will use
perl under hosttools, which can be too long for shebang, and cause
error:
bad interpreter: No such file or directory
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch | 34 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch new file mode 100644 index 0000000000..61669e3641 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch @@ -0,0 +1,34 @@ +From 5412077c398dec74321388fe6e593a44c4c80de6 Mon Sep 17 00:00:00 2001 +From: echo <fei.geng@windriver.com> +Date: Tue, 28 Apr 2009 03:11:06 +0000 +Subject: [PATCH] Fix perl install directory to /usr/bin + +Upstream-Status: Inappropriate [configuration] + +Add back this patch. Without this patch, apxs's shebang will use +perl under hosttools, which can be too long for shebang, and cause +error: +bad interpreter: No such file or directory + +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +--- + configure.in | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index d828512..be7bd25 100644 +--- a/configure.in ++++ b/configure.in +@@ -855,10 +855,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", + AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", + [Location of the MIME types config file, relative to the Apache root directory]) + +-perlbin=`$ac_aux_dir/PrintPath perl` +-if test "x$perlbin" = "x"; then +- perlbin="/replace/with/path/to/perl/interpreter" +-fi ++perlbin='/usr/bin/perl' + AC_SUBST(perlbin) + + dnl If we are running on BSD/OS, we need to use the BSD .include syntax. diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb index 2bd21f7d14..4cdf36ca57 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb @@ -13,6 +13,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0005-replace-lynx-to-curl-in-apachectl-script.patch \ file://0006-apache2-fix-the-race-issue-of-parallel-installation.patch \ file://0007-apache2-allow-to-disable-selinux-support.patch \ + file://apache-configure_perlbin.patch \ " SRC_URI_append_class-target = " \ |