[patch] Some essential offsets. Probably still more needed.

php-eblits-src_configure_v1.patch (text/plain), 3.40 KB, created by Heiko on 2010-10-05 15:38:11 UTC

diff -pruN php.orig/files/eblits/src_configure-v1.eblit php/files/eblits/src_configure-v1.eblit
--- php.orig/files/eblits/src_configure-v1.eblit	2010-10-05 12:58:05.785095002 +0200
+++ php/files/eblits/src_configure-v1.eblit	2010-10-05 15:49:18.717430002 +0200
@@ -21,10 +21,10 @@ eblit-php-src_configure() {
 
 	#                             extension	      USE flag        shared
 	phpconfutils_extension_enable  "bcmath"       "bcmath"           1
-	phpconfutils_extension_with    "bz2"          "bzip2"            1
+	phpconfutils_extension_with    "bz2"          "bzip2"            1 "${EPREFIX}/usr"
 	phpconfutils_extension_enable  "calendar"     "calendar"         1
 	phpconfutils_extension_disable "ctype"        "ctype"            0
-	phpconfutils_extension_with    "curl"         "curl"             1
+	phpconfutils_extension_with    "curl"         "curl"             1 "${EPREFIX}/usr"
 	phpconfutils_extension_with    "curlwrappers" "curlwrappers"     0
 	phpconfutils_extension_disable "dom"          "xml"              0
 	phpconfutils_extension_with    "enchant"      "enchant"          1 "${EPREFIX}/usr"
@@ -35,12 +35,17 @@ eblit-php-src_configure() {
 	phpconfutils_extension_with    "gettext"      "nls"              1 "${EPREFIX}/usr"
 	phpconfutils_extension_with    "gmp"          "gmp"              1 "${EPREFIX}/usr"
 	phpconfutils_extension_disable "hash"         "hash"             0
-	phpconfutils_extension_with    "iconv"        "iconv"            0 "${EPREFIX}/usr"
+	if has_version dev-libs/libiconv; then
+		phpconfutils_extension_with    "iconv"        "iconv"            0 "${EPREFIX}/usr"
+	else
+		phpconfutils_extension_with    "iconv"        "iconv"            0
+	fi
 	phpconfutils_extension_enable  "intl"         "intl"             1
 	phpconfutils_extension_disable "ipv6"         "ipv6"             0
 	phpconfutils_extension_disable "json"         "json"             0
 	phpconfutils_extension_with    "kerberos"     "kerberos"         0 "${EPREFIX}/usr"
 	phpconfutils_extension_disable "libxml"       "xml"              0
+	phpconfutils_extension_with    "libxml-dir"   "xml"              0 "${EPREFIX}/usr"
 	phpconfutils_extension_enable  "mbstring"     "unicode"          1
 	phpconfutils_extension_with    "mcrypt"       "crypt"            1 "${EPREFIX}/usr"
 	phpconfutils_extension_with    "mssql"        "mssql"            1
@@ -71,9 +76,9 @@ eblit-php-src_configure() {
 	phpconfutils_extension_disable "xmlreader"    "xmlreader"        0
 	phpconfutils_extension_disable "xmlwriter"    "xmlwriter"        0
 	phpconfutils_extension_with    "xmlrpc"       "xmlrpc"           1
-	phpconfutils_extension_with    "xsl"          "xsl"              1
+	phpconfutils_extension_with    "xsl"          "xsl"              1 "${EPREFIX}/usr"
 	phpconfutils_extension_enable  "zip"          "zip"              1
-	phpconfutils_extension_with    "zlib"         "zlib"             1
+	phpconfutils_extension_with    "zlib"         "zlib"             1 "${EPREFIX}/usr"
 	phpconfutils_extension_enable  "debug"        "debug"            0
 
 	# DBA support
@@ -195,8 +200,8 @@ eblit-php-src_configure() {
 	fi
 
 	# readline/libedit support
-	phpconfutils_extension_with "readline" "readline" 0
-	phpconfutils_extension_with "libedit"  "libedit"  0
+	phpconfutils_extension_with "readline" "readline" 0 "${EPREFIX}/usr"
+	phpconfutils_extension_with "libedit"  "libedit"  0 "${EPREFIX}/usr"
 
 	# Session support
 	if use session ; then