Changeset 6285

Timestamp:

10/14/10 09:18:08 (15 years ago)

Author:

Eric.Larour

Message:

Fix to gdal installation on linux 64 bits.

Location:

issm/trunk/externalpackages/gdal

Files:

• GDALmake.opt.patch (modified) (1 diff)
• install.sh (modified) (2 diffs)

issm/trunk/externalpackages/gdal/GDALmake.opt.patch

@@ -1 @@
-225,226c225
-< #CURL_LIB     =       -L/usr/kerberos/lib64 -lcurl -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv -ldl -lidn -lssl -lcrypto -lz  
-< CURL_LIB      =       -L/usr/lib64 -lcurl /usr/lib64/libgssapi_krb5.so.2  /usr/lib64/libkrb5.so.3 /usr/lib64/libk5crypto.so.3 /usr/lib64/libssl3.so -lresolv -ldl -lidn   -lz  
+31c31
+< LIBS  =       $(SDE_LIB) -I/usr/include -lsqlite3 -L/usr/lib -lexpat -ljpeg -lpng -lz  -lm -lrt -ldl  $(KAK_LIBS) $(DWG_LIBS) $(CURL_LIB) \
 ---
-> CURL_LIB      =       -L/usr/kerberos/lib64 -lcurl -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv -ldl -lidn -lssl -lcrypto -lz  
+> LIBS  =       $(SDE_LIB) -I/usr/include -lsqlite3 -L/usr/lib64 -lexpat -ljpeg -lpng -lz  -lm -lrt -ldl  $(KAK_LIBS) $(DWG_LIBS) $(CURL_LIB) \
+225c225
+< CURL_LIB      =       -L/usr/kerberos/lib64 -lcurl -ldl -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lidn -lssl -lcrypto -lz  
+---
+> CURL_LIB      =       -L/usr/lib64 -lcurl -ldl -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lidn -lssl -lcrypto -lz  

issm/trunk/externalpackages/gdal/install.sh

@@ -24 +24 @@
 #Configure gdal
 cd src
-./configure --prefix="$ISSM_TIER/externalpackages/gdal/install" --without-python --with-netcdf=no --with-jasper=no --without-ld-shared --with-unix-stdio-64=no
+./configure --prefix="$ISSM_TIER/externalpackages/gdal/install" --without-python --with-netcdf=no --with-jasper=no --without-ld-shared --with-unix-stdio-64=no --with-expat-lib=/usr/lib64/libexpat.so
 
 #Patch GDALmake.opt
-patch -R GDALmake.opt ../GDALmake.opt.patch
+patch GDALmake.opt ../GDALmake.opt.patch
+
 
 #Compile and install gdal
@@ -36 +37 @@
 else
         make -j $NUMCPUS
-        make -j $NUMCPUS install
+        make install
 fi