From 1eb1f5588146fcd4d555ecd2de420a7f8e186aa0 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 7 Apr 2018 20:02:17 -0700 Subject: apache2: refresh patches WARNING: apache2-2.4.29-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify devtool finish --force-patch-refresh Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch apache-configure_perlbin.patch patching file configure.in Hunk #1 succeeded at 855 with fuzz 2 (offset 217 lines). Signed-off-by: Armin Kuster --- .../apache2/apache2/apache-ssl-ltmain-rpath.patch | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch') diff --git a/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch b/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch index 413dc535e..f13da91f3 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch @@ -1,11 +1,11 @@ build/ltmain.sh | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) -diff --git a/build/ltmain.sh b/build/ltmain.sh -index 5eca4ae..805b461 100644 ---- a/build/ltmain.sh -+++ b/build/ltmain.sh -@@ -6944,7 +6944,7 @@ func_mode_link () +Index: httpd-2.4.29/build/ltmain.sh +=================================================================== +--- httpd-2.4.29.orig/build/ltmain.sh ++++ httpd-2.4.29/build/ltmain.sh +@@ -6969,7 +6969,7 @@ func_mode_link () dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in @@ -14,7 +14,7 @@ index 5eca4ae..805b461 100644 *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ -@@ -8137,7 +8137,7 @@ func_mode_link () +@@ -8167,7 +8167,7 @@ func_mode_link () $ECHO "*** $linklib is not portable!" fi if test lib = "$linkmode" && @@ -23,7 +23,7 @@ index 5eca4ae..805b461 100644 # Hardcode the library path. # Skip directories that are in the system default run-time # search path. -@@ -8404,7 +8404,7 @@ func_mode_link () +@@ -8434,7 +8434,7 @@ func_mode_link () if test lib = "$linkmode"; then if test -n "$dependency_libs" && @@ -32,7 +32,7 @@ index 5eca4ae..805b461 100644 test yes = "$build_old_libs" || test yes = "$link_static"; }; then # Extract -R from dependency_libs -@@ -9025,7 +9025,8 @@ func_mode_link () +@@ -9086,7 +9086,8 @@ func_mode_link () *) func_append finalize_rpath " $libdir" ;; esac done @@ -42,7 +42,7 @@ index 5eca4ae..805b461 100644 dependency_libs="$temp_xrpath $dependency_libs" fi fi -@@ -9473,7 +9474,7 @@ EOF +@@ -9534,7 +9535,7 @@ EOF case $archive_cmds in *\$LD\ *) wl= ;; esac @@ -51,7 +51,7 @@ index 5eca4ae..805b461 100644 # Hardcode the library paths hardcode_libdirs= dep_rpath= -@@ -10211,6 +10212,27 @@ EOF +@@ -10272,6 +10273,27 @@ EOF # Now hardcode the library paths rpath= hardcode_libdirs= @@ -79,6 +79,3 @@ index 5eca4ae..805b461 100644 for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then --- -1.9.1 - -- cgit v1.2.3-54-g00ecf