From 231013c1889f01cc33f33a7a25dbd9a4f0198ccb Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: May 09 2005 15:16:50 +0000
Subject: * Fri May  6 2005 Joe Orton <jorton@redhat.com> 5.0.4-10

- disable RPATHs in shared extensions (#156974)

---

diff --git a/php-5.0.4-norpath.patch b/php-5.0.4-norpath.patch
new file mode 100644
index 0000000..544c057
--- /dev/null
+++ b/php-5.0.4-norpath.patch
@@ -0,0 +1,25 @@
+
+Really don't enable any RPATHs if --disable-rpath is given.
+
+--- php-5.0.4/acinclude.m4.norpath
++++ php-5.0.4/acinclude.m4
+@@ -833,6 +833,7 @@
+ dnl internal, don't use
+ AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
+   PHP_RUN_ONCE(LIBPATH, $1, [
++    test "x$PHP_RPATH" != "xno" &&
+     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
+     LDFLAGS="$LDFLAGS -L$1"
+     PHP_RPATHS="$PHP_RPATHS $1"
+@@ -852,7 +853,11 @@
+       _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
+     ],[
+       if test "$ext_shared" = "yes"; then
++        if test "x$PHP_RPATH" = "xno"; then
++          $2="-L$ai_p [$]$2"
++        else
+         $2="$ld_runpath_switch$ai_p -L$ai_p [$]$2"
++        fi
+       else
+         _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
+       fi
diff --git a/php.spec b/php.spec
index f6b5ba4..d01ff60 100644
--- a/php.spec
+++ b/php.spec
@@ -7,7 +7,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.0.4
-Release: 9
+Release: 10
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -26,6 +26,7 @@ Patch2: php-5.0.1-config.patch
 Patch3: php-5.0.4-lib64.patch
 Patch4: php-4.2.2-cxx.patch
 Patch5: php-4.3.3-install.patch
+Patch6: php-5.0.4-norpath.patch
 Patch7: php-4.3.2-libtool15.patch
 Patch9: php-4.3.6-umask.patch
 Patch10: php-5.0.2-gdnspace.patch
@@ -329,6 +330,7 @@ support for using the DBA database abstraction layer to PHP.
 %patch3 -p1 -b .lib64
 %patch4 -p1 -b .cxx
 %patch5 -p1 -b .install
+%patch6 -p1 -b .norpath
 %patch7 -p1 -b .libtool15
 %patch9 -p1 -b .umask
 %patch10 -p1 -b .gdnspace
@@ -640,6 +642,9 @@ rm files.*
 %endif
 
 %changelog
+* Fri May  6 2005 Joe Orton <jorton@redhat.com> 5.0.4-10
+- disable RPATHs in shared extensions (#156974)
+
 * Tue May  3 2005 Joe Orton <jorton@redhat.com> 5.0.4-9
 - build simplexml_import_dom even with shared dom (#156434)
 - prevent truncation of copied files to ~2Mb (#155916)