1 files changed, 76 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch
new file mode 100644
index 0000000000..3a59fb0799
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch
@@ -0,0 +1,76 @@
+--- 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

diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch new file mode 100644 index 0000000000..3a59fb0799 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch
@@ -0,0 +1,76 @@
	1	--- httpd-2.2.8.orig/build/ltmain.sh
	2	+++ httpd-2.2.8/build/ltmain.sh
	3	@@ -1515,7 +1515,7 @@ EOF
	4	dir=`$echo "X$arg" \| $Xsed -e 's/^-L//'`
	5	# We need an absolute path.
	6	case $dir in
	7	- [\\/]* \| [A-Za-z]:[\\/]*) ;;
	8	+ =* \| [\\/]* \| [A-Za-z]:[\\/]*) ;;
	9	*)
	10	absdir=`cd "$dir" && pwd`
	11	if test -z "$absdir"; then
	12	@@ -2558,7 +2558,7 @@ EOF
	13	$echo "*** $linklib is not portable!"
	14	fi
	15	if test "$linkmode" = lib &&
	16	- test "$hardcode_into_libs" = yes; then
	17	+ test "x$wrs_use_rpaths" = "xyes" && test "$hardcode_into_libs" = yes; then
	18	# Hardcode the library path.
	19	# Skip directories that are in the system default run-time
	20	# search path.
	21	@@ -2832,7 +2832,7 @@ EOF
	22
	23	if test "$linkmode" = lib; then
	24	if test -n "$dependency_libs" &&
	25	- { test "$hardcode_into_libs" != yes \|\|
	26	+ { test "$hardcode_into_libs" != yes \|\| test "x$wrs_use_rpaths" != "xyes" \|\|
	27	test "$build_old_libs" = yes \|\|
	28	test "$link_static" = yes; }; then
	29	# Extract -R from dependency_libs
	30	@@ -3426,7 +3426,8 @@ EOF
	31	*) finalize_rpath="$finalize_rpath $libdir" ;;
	32	esac
	33	done
	34	- if test "$hardcode_into_libs" != yes \|\| test "$build_old_libs" = yes; then
	35	+ if test "$hardcode_into_libs" != yes \|\| test "x$wrs_use_rpaths" != "xyes" \|\|
	36	+ test "$build_old_libs" = yes; then
	37	dependency_libs="$temp_xrpath $dependency_libs"
	38	fi
	39	fi
	40	@@ -3843,7 +3844,7 @@ EOF
	41	case $archive_cmds in
	42	\$LD\ ) wl= ;;
	43	esac
	44	- if test "$hardcode_into_libs" = yes; then
	45	+ if test "$hardcode_into_libs" = yes && test "x$wrs_use_rpaths" = "xyes" ; then
	46	# Hardcode the library paths
	47	hardcode_libdirs=
	48	dep_rpath=
	49	@@ -4397,6 +4398,27 @@ EOF
	50	# Now hardcode the library paths
	51	rpath=
	52	hardcode_libdirs=
	53	+
	54	+ # short circuit putting rpaths in executables
	55	+ #
	56	+ if test "x$wrs_use_rpaths" != "xyes" ; then
	57	+ flag=
	58	+ for libdir in $compile_rpath; do
	59	+ case $(echo $libdir \| ${SED} 's,/[/]*,/,g') in
	60	+ /usr/lib/* \| /usr/lib32/* \| /usr/lib64/* ) flag="$flag $libdir" ;;
	61	+ esac
	62	+ done
	63	+ compile_rpath="$flag"
	64	+
	65	+ flag=
	66	+ for libdir in $finalize_rpath; do
	67	+ case $(echo $libdir \| ${SED} 's,/[/]*,/,g') in
	68	+ /usr/lib/* \| /usr/lib32/* \| /usr/lib64/* ) flag="$flag $libdir" ;;
	69	+ esac
	70	+ done
	71	+ finalize_rpath="$flag"
	72	+ fi
	73	+
	74	for libdir in $compile_rpath $finalize_rpath; do
	75	if test -n "$hardcode_libdir_flag_spec"; then
	76	if test -n "$hardcode_libdir_separator"; then