diff options
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch | 62 |
1 files changed, 35 insertions, 27 deletions
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 3a59fb0799..413dc535e4 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,52 +1,57 @@ ---- httpd-2.2.8.orig/build/ltmain.sh -+++ httpd-2.2.8/build/ltmain.sh -@@ -1515,7 +1515,7 @@ EOF - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` + 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 () + dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; + =* | [\\/]* | [A-Za-z]:[\\/]*) ;; *) absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then -@@ -2558,7 +2558,7 @@ EOF - $echo "*** $linklib is not portable!" + test -z "$absdir" && \ +@@ -8137,7 +8137,7 @@ func_mode_link () + $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && -- test "$hardcode_into_libs" = yes; then -+ test "x$wrs_use_rpaths" = "xyes" && test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && +- test yes = "$hardcode_into_libs"; then ++ test "x$wrs_use_rpaths" = "xyes" && test "$hardcode_into_libs" = yes; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. -@@ -2832,7 +2832,7 @@ EOF +@@ -8404,7 +8404,7 @@ func_mode_link () - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && -- { test "$hardcode_into_libs" != yes || -+ { test "$hardcode_into_libs" != yes || test "x$wrs_use_rpaths" != "xyes" || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then +- { test yes != "$hardcode_into_libs" || ++ { test yes != "$hardcode_into_libs" || test "x$wrs_use_rpaths" != "xyes" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs -@@ -3426,7 +3426,8 @@ EOF - *) finalize_rpath="$finalize_rpath $libdir" ;; +@@ -9025,7 +9025,8 @@ func_mode_link () + *) func_append finalize_rpath " $libdir" ;; esac done -- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -+ if test "$hardcode_into_libs" != yes || test "x$wrs_use_rpaths" != "xyes" || -+ test "$build_old_libs" = yes; then +- if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then ++ if test yes != "$hardcode_into_libs" || test "x$wrs_use_rpaths" != "xyes" || ++ test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi -@@ -3843,7 +3844,7 @@ EOF - case $archive_cmds in - *\$LD\ *) wl= ;; +@@ -9473,7 +9474,7 @@ EOF + case $archive_cmds in + *\$LD\ *) wl= ;; esac -- if test "$hardcode_into_libs" = yes; then -+ if test "$hardcode_into_libs" = yes && test "x$wrs_use_rpaths" = "xyes" ; then +- if test yes = "$hardcode_into_libs"; then ++ if test yes = "$hardcode_into_libs" && test "x$wrs_use_rpaths" = "xyes"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= -@@ -4397,6 +4398,27 @@ EOF +@@ -10211,6 +10212,27 @@ EOF # Now hardcode the library paths rpath= hardcode_libdirs= @@ -74,3 +79,6 @@ 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 + |