Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/net
In directory vz-cvs-3.sog:/tmp/cvs-serv30509
Modified Files:
libcurl4.info
Log Message:
sync. w/ 10.5, validated on powerpc-darwin8
Index: libcurl4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/net/libcurl4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libcurl4.info 11 Jul 2011 04:05:47 -0000 1.1
+++ libcurl4.info 13 Sep 2011 22:03:32 -0000 1.2
@@ -1,10 +1,10 @@
Info4: <<
Package: libcurl4%type_pkg[-64bit]
-Version: 7.21.7
+Version: 7.22.0
Revision: 1
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
-Distribution: ( %type_raw[-64bit] = -64bit ) 10.5, ( %type_raw[-64bit] =
-64bit ) 10.6
+# Distribution: 10.5
Description: Lib. for transferring files with URL syntax
DescDetail: <<
curl is a command line tool for transferring files with URL syntax,
@@ -46,12 +46,11 @@
Source: http://curl.haxx.se/download/curl-%v.tar.bz2
#Source: mirror:custom:curl-%v.tar.bz2
-Source-MD5: 5f6d50c4d4ee38c57fe37e3cff75adbd
+Source-MD5: bdb5c226d37c4a6082c70e7ef6f63060
Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1), ( %type_raw[-64bit] =
-64bit ) 64bit-cpu
BuildDepends: <<
fink (>= 0.26.2),
- libcares2%type_pkg[-64bit] (>= 1.7.4-1),
libssh2.1%type_pkg[-64bit] (>= 1.2.7-1),
system-openssl-dev
<<
@@ -67,9 +66,6 @@
perl -pi -e 's,\@LDFLAGS\@,,g; s,\@LIBCURL_LIBS\@,,g' libcurl.pc.in
#There is no more libcurl.a so trick curl-config --static-libs into
using libcurl.dylib. Fixes building of pycurl.
perl -pi -e 's/\@libext\@/dylib/' curl-config.in
- #There are issues connecting to servers with IPv6 and IPv4 addresses
when our
- #connection only supports IPv4. Default to using IPv4.
- perl -pi -e 's/^#if ARES_VERSION.*$/#if 0/' lib/hostares.c
#Set up to use system's ldap
/bin/cp /usr/include/lber*.h .
/bin/cp /usr/include/ldap*.h .
@@ -80,6 +76,7 @@
NoSetLDFLAGS: true
SetCPPFLAGS: -I%b -I%p/lib/system-openssl/include -I%p/include
SetLDFLAGS: -L%b -L%p/lib/system-openssl/lib -L%p/%lib
+# -Wl,-dead_strip_dylibs
SetCFLAGS: -Os
ConfigureParams: <<
--with-ssl=%p/lib/system-openssl \
@@ -93,7 +90,7 @@
--without-libidn \
--without-librtmp \
--enable-hidden-symbols \
- --enable-ares \
+ --enable-threaded-resolver \
--with-ca-bundle=%p/etc/ssl/certs/ca-bundle.crt \
--disable-static \
--libdir='${prefix}/%lib' \
@@ -103,12 +100,6 @@
CompileScript: <<
#!/bin/bash -ev
- # This bit enables stripping unused libs on 10.5 and later.
- let version=`uname -r | cut -f 1 -d .`
- if [ $version -ge 9 ]; then
- export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"
- fi
-
if [ "%type_raw[-64bit]" == "-64bit" ]; then
export CC="gcc -m64"
fi
@@ -135,7 +126,6 @@
Depends: <<
( %type_raw[-64bit] = -64bit ) 64bit-cpu,
ca-bundle,
- libcares2%type_pkg[-64bit]-shlibs (>= 1.7.4-1),
libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2.7-1)
<<
@@ -175,7 +165,9 @@
#This test seems to hang.
echo '283' >>tests/data/DISABLED
echo '525' >>tests/data/DISABLED
+ echo '554' >>tests/data/DISABLED
echo '1007' >>tests/data/DISABLED
+ echo '1086' >>tests/data/DISABLED
echo '1099' >>tests/data/DISABLED
echo '2002' >>tests/data/DISABLED
echo '2003' >>tests/data/DISABLED
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
