Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv11425/10.4-EOL/devel

Modified Files:
        ppl9.info 
Log Message:
sync. w/ experimental, ppl9 actually depends on glpk-shlibs


Index: ppl9.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/devel/ppl9.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ppl9.info   11 Jul 2011 04:05:40 -0000      1.1
+++ ppl9.info   15 Aug 2011 21:26:56 -0000      1.2
@@ -1,10 +1,14 @@
 Package: ppl9
 Version: 0.11.2
-Revision: 1
+Revision: 2
 BuildDependsOnly: True
-Depends: %N-shlibs (= %v-%r)
+Depends: <<
+       %N-shlibs (= %v-%r),
+       glpk-shlibs (>= 4.29-1)
+<<
 BuildDepends: <<
        fink (>= 0.28),
+       glpk-dev (>= 4.29-1),
        gmp5,
        m4,
        system-java-dev
@@ -19,6 +23,7 @@
        --infodir=%p/share/info \
        --disable-static \
        --enable-pch \
+       $disable_fpmath \
        --with-java="$JAVA_HOME" \
        CFLAGS="-g -O2 -pipe -fpch-preprocess -fPIC" \
        CXXFLAGS="-g -O2 -pipe -fpch-preprocess -fPIC" \
@@ -56,6 +61,7 @@
        x64_64 ) ;;
        esac
 <<
+UseMaxBuildJobs: true
 CompileScript: <<
        #!/bin/sh -ev
        mkdir build
@@ -81,11 +87,14 @@
            echo "Please upgrade Xcode Developer Tools from Apple." ; \
            exit 1; }
        fi
+       # workaround llvm/clang's absence of -f rounding-math, 
+       # which caused test suite failures
+       if test "$darwin_vers" -ge 11 ; then
+         disable_fpmath="--disable-fpmath"
+       fi
        ../configure %c
        # for ccache-default
        export CCACHE_SLOPPINESS=time_macros
-       # num_cpu=$(echo `sysctl -n hw.ncpu`)
-       # make -j $num_cpu
        make
 <<
 InfoTest: <<
@@ -94,11 +103,8 @@
        cd build
        # for ccache-default
        export CCACHE_SLOPPINESS=time_macros
-       #num_cpu=$(echo `sysctl -n hw.ncpu`)
-       #make -j $num_cpu -k check || exit 2
        make -k check || exit 2
        <<
-       TestDepends: glpk-dev
        TestSuiteSize: large
 <<
 InstallScript: <<
@@ -162,6 +168,8 @@
 exception-safe, rather efficient and thoroughly documented.
 <<
 DescPackaging: <<
+ppl_lpsol (bin) links against libglpk, but none of ppl-shlibs depend on it.
+
 Reminder to never move %p/lib/ppl from ppl-shlibs since it
 brings over private .la as well as private shared lib.
 


------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model 
configuration take the hassle out of deploying and managing Subversion and 
the tools developers use with it. Learn more about uberSVN and get a free 
download at:  http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to