[Jboss-svn-commits] JBL Code SVN: r4589 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-03 03:12:03 -0400 (Sat, 03 Jun 2006)
New Revision: 4589

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Add iconv... It seems it is not often installed on Solaris.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-03 06:04:59 UTC (rev 4588)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-03 07:12:03 UTC (rev 4589)
@@ -41,6 +41,8 @@
 LDAPVER=2.2.13
 LDAPURL=http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${LDAPVER}.tgz
 
+ICNVVER=1.9.2
+ICNVURL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICNVVER}.tar.gz
 # Platfrom directory and cache
 TOOLS=$HOME/`uname -s`_`uname -p`_tools
 CACHE=`uname -s`_`uname -p`_cache
@@ -55,6 +57,7 @@
 BUILDJPEG=true
 BUILDMSQL=false
 BUILDLDAP=true
+BUILDICNV=true
 CC=gcc
 COMPILER=""
 ADDCONF=""
@@ -340,6 +343,15 @@
 esac
 
 #
+# build iconv if required.
+if ${BUILDICNV}
+then
+  Extract libiconv ${ICNVURL} ${ICNVVER}
+  Build libiconv-${ICNVVER} ${TOOLS}/ICNV "--enable-shared" "" ""
+  ADDCONF="$ADDCONF --with-iconv-dir=$TOOLS/ICNV"
+fi
+
+#
 # build mysql if required.
 # Note the trick ADDCONF is filled before.
 if ${BUILDMSQL}
@@ -573,6 +585,14 @@
   exit 1
 fi
 
+# hack... Something try to use libldap.la for /usr/local/lib
+if ${BUILDLDAP}
+then
+  cp $TOOLS/LDAP/lib/*.la php-${PHPVER}/
+  chmod -w php-${PHPVER}/*.la
+fi
+
+
 (cd php-${PHPVER}
 make
 )