[oe-commits] Paul Eggleton : apache2: do not patch generated file

git at git.openembedded.org git at git.openembedded.org
Wed Aug 6 23:07:22 UTC 2014


Module: meta-openembedded.git
Branch: master-next
Commit: 51766f9ce94a0db8ba6d4024367e5a823cc56c96
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=51766f9ce94a0db8ba6d4024367e5a823cc56c96

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Aug  5 14:20:42 2014 +0100

apache2: do not patch generated file

We already patch configure.ac and we're not bypassing autoreconf,
so we don't need to patch configure as well.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../apache2/apache2/apache-configure_perlbin.patch      | 17 -----------------
 1 file changed, 17 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
index baa739f..c90279d 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch
@@ -4,23 +4,6 @@
 #
 # Upstream-Status: Inappropriate [configuration]
 
---- a/configure
-+++ b/configure
-@@ -22365,13 +22365,7 @@
- #define APACHE_MPM_DIR "$MPM_DIR"
- _ACEOF
-
--
--perlbin=`$ac_aux_dir/PrintPath perl`
--if test "x$perlbin" = "x"; then
--    perlbin="/replace/with/path/to/perl/interpreter"
--fi
--
--
-+perlbin='/usr/bin/perl'
-
- BSD_MAKEFILE=no
- ap_make_include=include
 --- a/configure.in
 +++ b/configure.in
 @@ -638,10 +638,7 @@



More information about the Openembedded-commits mailing list