Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/pythonmods
In directory vz-cvs-3.sog:/tmp/cvs-serv10235

Modified Files:
        pycurl-py.info 
Added Files:
        pycurl-py.patch 
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8


--- NEW FILE: pycurl-py.patch ---
diff -ru pycurl-7.19.0.orig/setup.py pycurl-7.19.0/setup.py
--- pycurl-7.19.0.orig/setup.py 2008-09-09 13:40:34.000000000 -0400
+++ pycurl-7.19.0/setup.py      2008-09-30 09:45:54.000000000 -0400
@@ -97,7 +97,8 @@
         else:
             extra_compile_args.append(e)
     libs = split_quoted(
-        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
+        os.popen("'%s' --libs" % CURL_CONFIG).read())
+    static_libs = split_quoted(
         os.popen("'%s' --static-libs" % CURL_CONFIG).read())
     for e in libs:
         if e[:2] == "-l":
@@ -110,6 +111,12 @@
             library_dirs.append(e[2:])
         else:
             extra_link_args.append(e)
+    for e in static_libs:
+        if e[:2] == "-l":
+            if e[2:] == 'ssl':
+                define_macros.append(('HAVE_CURL_OPENSSL', 1))
+            if e[2:] == 'gnutls':
+                define_macros.append(('HAVE_CURL_GNUTLS', 1))
     for e in split_quoted(os.popen("'%s' --features" % CURL_CONFIG).read()):
         if e == 'SSL':
             define_macros.append(('HAVE_CURL_SSL', 1))

Index: pycurl-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/pythonmods/pycurl-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pycurl-py.info      11 Jul 2011 04:08:34 -0000      1.1
+++ pycurl-py.info      22 Nov 2011 18:46:43 -0000      1.2
@@ -1,24 +1,33 @@
 Info2: <<
 Package: pycurl-py%type_pkg[python]
-Version: 7.18.2
+Version: 7.19.0
 Revision: 1
 Distribution: (%type_pkg[python] = 23) 10.4, (%type_pkg[python] = 24) 10.4, 
(%type_pkg[python] = 24) 10.5
-Type: python (2.3 2.4 2.5)
+Type: python (2.3 2.4 2.5 2.6 2.7)
 Description: Python bindings for libcurl
 DescPackaging: <<
  setup.py installs all docs--so no need for DocFiles--but
  in a non-versioned directory, so we need to rename
  %i/share/doc/pycurl to %i/share/doc/pycurl-py%type_pkg[python].
+ 
+ Patch setup.py to not link in static libs.
 <<
 Maintainer: Daniel Johnson <[email protected]>
 License: GPL
 Homepage: http://pycurl.sourceforge.net/
 
 Source: http://pycurl.sourceforge.net/download/pycurl-%v.tar.gz
-Source-MD5: 39210d56f1d5a75ac8dd6a2866a93dd5
+Source-MD5: 919d58fe37e69fe87ce4534d8b6a1c7b
 
-Depends: python%type_pkg[python], libcurl4-shlibs (>= 7.18.2), libssh2.1-shlibs
-BuildDepends: libcurl4 (>= 7.18.2), system-openssl-dev, fink (>= 0.24.12), 
libssh2.1
+PatchFile: %{Ni}.patch
+PatchFile-MD5: 0da644701607d84870b3cc6126457b41
+
+Depends: python%type_pkg[python], libcurl4-shlibs (>= 7.18.2)
+BuildDepends: libcurl4 (>= 7.18.2), system-openssl-dev, fink (>= 0.24.12)
+
+NoSetCPPFLAGS: true
+NoSetLDFLAGS: true
+SetLDFLAGS: -L%p/lib/system-openssl/lib -lcrypto
 
 CompileScript: <<
  %p/bin/python%type_raw[python] setup.py build 
--curl-config=%p/bin/curl-config --openssl-dir=%p/lib/system-openssl


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to