Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29791

Modified Files:
        libserf1.info 
Log Message:
sync. w/ 10.!4/stable, powerpc-darwin8 1 test fails
patched to workaround scons idiocy
!lart scons


Index: libserf1.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/libserf1.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libserf1.info       19 Jun 2013 20:32:56 -0000      1.2
+++ libserf1.info       14 Aug 2013 22:26:58 -0000      1.3
@@ -1,43 +1,86 @@
 Package: libserf1
-Version: 1.2.1
-Revision: 1
+Version: 1.3.0
+Revision: 3
 Description: High-performance HTTP client library
 License: BSD
 Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
 
 # Dependencies:
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.24.12-1), libapr.0-dev (>= 1.4.2-1), libaprutil.0-dev 
(>= 1.3.10-2), openssl100-dev (>= 1.0.1e-1)
+BuildDepends: fink (>= 0.24.12-1), libapr.0-dev (>= 1.4.2-1), libaprutil.0-dev 
(>= 1.3.10-2), openssl100-dev (>= 1.0.1e-1), scons
 BuildDependsOnly: true
 
 # Unpack Phase:
 Source: http://serf.googlecode.com/files/serf-%v.tar.bz2
-Source-MD5: 4f8e76c9c6567aee1d66aba49f76a58b 
+Source-MD5: bb0dbf9494495db7e8b34eac99b2dc3a 
 
-# Needed to make tests work.
+# scons sucks so patch to use right install_name.
 PatchScript: <<
-       perl -pi -e 's/-static//' Makefile.in
+       perl -pi -e "s|install_shared_path,|'%p/lib/libserf-1.0.dylib',|" 
SConstruct
+       # darwin8'd ld uses -dylib_install_name -- fangism
+       # sed -i.orig -e 's|-install_name|-dylib_install_name|g' SConstruct
 <<
 
 # Compile Phase:
-# SetLDFLAGS: -Wl,-dead_strip_dylibs
-ConfigureParams: <<
-       --with-apr=%p/bin/apr-1-config \
-       --with-apr-util=%p/bin/apu-1-config \
-       --with-openssl=%p
+CompileScript: <<
+       #!/bin/bash -ev
+       arch=%m
+       test "%m" != powerpc || arch=ppc
+       if [ "%m" != "x86_64" ]; then
+               scons \
+                       PREFIX=%p \
+                       CFLAGS=-m32 \
+                       LINKFLAGS=-Wl,-arch,$arch \
+                       APR=%p/bin/apr-1-config \
+                       APU=%p/bin/apu-1-config \
+                       OPENSSL=%p \
+                       GSSAPI=/usr/bin/krb5-config
+       else
+               scons \
+                       PREFIX=%p \
+                       CFLAGS=-m64 \
+                       LINKFLAGS=-Wl,-arch,%m \
+                       APR=%p/bin/apr-1-config \
+                       APU=%p/bin/apu-1-config \
+                       OPENSSL=%p \
+                       GSSAPI=/usr/bin/krb5-config
+       fi
 <<
 
 InfoTest: <<
-  TestScript: make check || exit 2
+       TestScript: <<
+               #!/bin/bash -ev
+               # hack the SConstruct script to work on darwin8 -- fangism
+               sed -i.orig -e 
'/LINKFLAGS/s|-install_name,|-dylib_file,%%%%''s/%%%%''s.dylib:|' \
+                       -e '/LINKFLAGS/s|thisdir,|libdir, LIBNAME, &|' \
+                       -e '/-compatibility_version/d' \
+                       -e '/-current_version/d' SConstruct
+               arch=%m
+               test "%m" != powerpc || arch=ppc
+               if [ "%m" != "x86_64" ]; then
+                       scons CFLAGS=-m32 LINKFLAGS=-Wl,-arch,$arch check || 
exit 2
+               else
+                       scons CFLAGS=-m64 LINKFLAGS=-Wl,-arch,%m check || exit 2
+               fi
+       <<
 <<
 
 # Install Phase:
+# Here we have to do all kinds of crazy stuff because scons sucks.
+InstallScript: <<
+       mkdir -p %i
+       scons install PREFIX=%i
+       mv %i/lib/libserf-1.dylib %i/lib/libserf-1.0.dylib
+       ln -s libserf-1.0.dylib %i/lib/libserf-1.dylib
+       rm %i/lib/libserf-1.a
+<<
+
 SplitOff: <<
   Package: %N-shlibs
   Depends: libapr.0-shlibs (>= 1.4.2-1), libaprutil.0-shlibs (>= 1.3.10-2), 
openssl100-shlibs (>= 1.0.1e-1)
   Replaces: %N (<= 0.7.0-2)
   Files: lib/libserf-1.*.dylib
-  Shlibs: %p/lib/libserf-1.0.dylib 1.0.0 %n (>= 1.0.0-1)
+  Shlibs: %p/lib/libserf-1.0.dylib 4.0.0 %n (>= 1.3.0-1)
   DocFiles: LICENSE NOTICE README
 <<
 DocFiles: CHANGES design-guide.txt LICENSE NOTICE README


------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to