mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 05:49:57 +00:00
Paul Eggleton
25ba859ab6
* Enable threading for PHP * Backport a number of patches * Use apachectl in init script * Install modules into a sane location * Ensure apxs script is installed into sysroot in crossscripts directory and modified so that it works for building PHP * Install httpd executable for native version so that PHP configure script can call it * Rename server-makefile-patch to server-makefile.patch and drop apply=yes * Add LIC_FILES_CHKSUM * Fix packaging QA warnings * Add LSB headers to init script * Clean out some cruft and move packaging stuff after do_install Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
77 lines
2.6 KiB
Diff
77 lines
2.6 KiB
Diff
--- 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//'`
|
|
# 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!"
|
|
fi
|
|
if test "$linkmode" = lib &&
|
|
- test "$hardcode_into_libs" = yes; 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
|
|
|
|
if test "$linkmode" = lib; 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
|
|
# Extract -R from dependency_libs
|
|
@@ -3426,7 +3426,8 @@ EOF
|
|
*) finalize_rpath="$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
|
|
dependency_libs="$temp_xrpath $dependency_libs"
|
|
fi
|
|
fi
|
|
@@ -3843,7 +3844,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
|
|
# Hardcode the library paths
|
|
hardcode_libdirs=
|
|
dep_rpath=
|
|
@@ -4397,6 +4398,27 @@ EOF
|
|
# Now hardcode the library paths
|
|
rpath=
|
|
hardcode_libdirs=
|
|
+
|
|
+ # short circuit putting rpaths in executables
|
|
+ #
|
|
+ if test "x$wrs_use_rpaths" != "xyes" ; then
|
|
+ flag=
|
|
+ for libdir in $compile_rpath; do
|
|
+ case $(echo $libdir | ${SED} 's,/[/]*,/,g') in
|
|
+ /usr/lib/* | /usr/lib32/* | /usr/lib64/* ) flag="$flag $libdir" ;;
|
|
+ esac
|
|
+ done
|
|
+ compile_rpath="$flag"
|
|
+
|
|
+ flag=
|
|
+ for libdir in $finalize_rpath; do
|
|
+ case $(echo $libdir | ${SED} 's,/[/]*,/,g') in
|
|
+ /usr/lib/* | /usr/lib32/* | /usr/lib64/* ) flag="$flag $libdir" ;;
|
|
+ esac
|
|
+ done
|
|
+ finalize_rpath="$flag"
|
|
+ fi
|
|
+
|
|
for libdir in $compile_rpath $finalize_rpath; do
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
if test -n "$hardcode_libdir_separator"; then
|