Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6235/10.7/stable/main/finkinfo/sci
Modified Files: nan-oct-2.5.2.info Log Message: Needs gcc4.7 Index: nan-oct-2.5.2.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/nan-oct-2.5.2.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- nan-oct-2.5.2.info 18 Apr 2013 02:37:39 -0000 1.9 +++ nan-oct-2.5.2.info 1 May 2013 17:07:56 -0000 1.10 @@ -1,7 +1,7 @@ Info2: << Package: nan%type_pkg[-blas]-oct%type_pkg[oct] Version: 2.5.2 -Type: oct (3.0.5), forge (nan), -blas (-atlas -ref .), gcc (4.8), lapack (3.4.2) +Type: oct (3.0.5), forge (nan), -blas (-atlas -ref .), gcc (4.7), lapack (3.4.2) Revision: 8 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net> # unfortunately, Homepage won't do types @@ -79,22 +79,14 @@ << License: GPL3+ -# Most octave-forge packages have to have the following BuildDepends: -# liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, -# fftw3, -# ( %type_pkg[oct] = 305 ) hdf5.7-oldapi, -# ( %type_pkg[oct] != 305 ) hdf5.7 -# -# Packages which serve only Octave-3.0.5 or only Octave > 3.0.5 need -# not use the conditional, of course. - BuildDepends: << (%type_raw[-blas] = -atlas) atlas (>=3.10.1-1), (%type_raw[-blas] = -atlas) liboctave%type_pkg[oct]-newatlas-dev, (%type_raw[-blas] = .) liboctave%type_pkg[oct]-accelerate-dev, (%type_raw[-blas] = -ref) lapack%type_pkg[lapack], (%type_raw[-blas] = -ref) liboctave%type_pkg[oct]-ref-dev, - liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, + gcc%type_pkg[gcc]-compiler, + fink-octave-scripts (>= 0.2.0-1), fftw3, hdf5.7-oldapi << @@ -120,10 +112,8 @@ %type_raw[forge]-oct%type_pkg[oct] << +Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz Source-MD5: 6546dfd8da863834f582934a38870a09 - -#### Insert required changes here #### - SourceDirectory: NaN PatchFile: %{Ni}.patch @@ -132,7 +122,7 @@ #!/bin/sh -ev sed -e 's|@FINKPREFIX@|%p|g' \ -e 's|@OCTVERSION@|%type_raw[oct]|g' \ - -e "s|@BLAS_LIBS@|`mkoctfile-%type_raw[oct]-gcc%type_raw[gcc] -p BLAS_LIBS`|" \ + -e "s|@BLAS_LIBS@|`mkoctfile -p BLAS_LIBS`|" \ -e 's|@GCC@|%type_raw[gcc]|' \ %{PatchFile} | patch -p1 cd src @@ -140,27 +130,6 @@ << SetLIBS: -L%p/lib/gcc%type_raw[gcc]/lib/ - -DescPort: << -Wants libgomp; we use gcc47-compiler to avoid mixing clang and llvm stuff. - -src/Makefile: patch in the locations of the gcc47-compiler executables and the - gcc47-enabled mkoctfile executable from octaveN-dev; also set LIBS. - -src/xptopen.cpp: OS X defines __DARWIN_BYTE_ORDER, __DARWIN_BIG_ENDIAN, and - __DARWIN_LITTLE_ENDIAN rather than just __BYTE_ORDER, - __BIG_ENDIAN, and __LITTLE_ENDIAN, respectively, so we - #define the latter as their __DARWIN_ counterparts. -<< - -###################################### - -# Do not change anything from this point down, unless absolutely necessary, -# since the foo-oct%type_pkg[oct] packages are designed to be built/installed -# in the same way. - -Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz - NoSetCPPFLAGS: true NoSetLDFLAGS: true SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib @@ -169,51 +138,53 @@ CompileScript: << #!/bin/sh -ev -if [ $UID -ne 0 ] -then - echo "%n cannot be built with --build-as-nobody" - exit 1 -fi -export OCTAVE=%p/bin/octave-%type_raw[oct] -# repack tarball, since the source directory name doesn't correspond -# to the package name, and Octave's pkg tool hates that. -pushd .. -tar -cf %type_raw[forge].tar NaN -pkgsrc=%type_raw[forge].tar -popd -%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh $pkgsrc -<< -InstallScript: << - #!/bin/sh -ev - %p/share/octave/%type_raw[oct]/scripts/octave-forge-install.sh %type_raw[forge]-%v %i %b - mkdir -p %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v - # copy template scripts - cp %p/share/octave/%type_raw[oct]/scripts/octave-forge-prerm %p/share/octave/%type_raw[oct]/scripts/octave-forge-postinst %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v - cd %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v - sed -i -e 's/@PKGNAME@/%type_raw[forge]-%v/' octave-forge-postinst - sed -i -e 's/@PKGNAME@/%type_raw[forge]/' octave-forge-prerm - chmod a+x octave-forge* -<< +pkgsrc=nan -PostInstScript: << - if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f %p/var/octave/%type_raw[oct]/octave_packages ] - then - `which xvfb-run` %p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst - else - mv %p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages %p/var/octave/%type_raw[oct]/octave_packages - fi +%p/share/fink-octave-scripts/octave-forge-patch.sh %type_raw[forge] %v %type_raw[oct] %b %i $pkgsrc + +# needs to use gcc47 to build, so stash a special mkoctfile in %b/bin +./genmkoctfile.sh %type_raw[gcc] +export PATH="%b/bin:$PATH" + +./octave-forge-compile.sh << -PreRmScript: `which xvfb-run` %p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm +InstallScript: ./octave-forge-install.sh +PostInstScript: %p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-postinst.sh +PreRmScript: %p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-prerm.sh DescPackaging: << This package: - Patch to Use BLAS_LIBS output from mkoctfile rather than just -lblas. -Common for all octave-forge packages: +Wants libgomp; we use gcc47-compiler for that. +The package doesn't appear to get along with gcc48: + +/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib: In function 'long long int std::abs(long long int)': +/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:174:20: error: declaration of C function 'long long int std::abs(long long int)' conflicts with + abs(long long __x) { return __builtin_llabs (__x); } + ^ +/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:166:3: error: previous declaration 'long int std::abs(long int)' here + abs(long __i) { return __builtin_labs(__i); } + ^ +/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib: In function '__int128 std::abs(__int128)': +/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:179:19: error: declaration of C function '__int128 std::abs(__int128)' conflicts with + abs(__int128 __x) { return __x >= 0 ? __x : -__x; } + ^ +/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:174:3: error: previous declaration 'long long int std::abs(long long int)' here + abs(long long __x) { return __builtin_llabs (__x); } + ^ +/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:179:19: error: declaration of C function '__int128 std::abs(__int128)' conflicts with + abs(__int128 __x) { return __x >= 0 ? __x : -__x; } + ^ +/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:166:3: error: previous declaration 'long int std::abs(long int)' here + abs(long __i) { return __builtin_labs(__i); } + +src/Makefile: patch in the locations of the gcc47-compiler executables and the + gcc47-enabled mkoctfile. +Common for all octave-forge packages: We read in postinst and prerm template scripts installed by octaveN and modify them to use the name of this package because Octave's package manager can't cope with non-literal arguments. @@ -221,4 +192,12 @@ The Type: forge (pkgname) is used to minimize what needs to be changed when using this .info file as a template. << +DescPort: << +src/xptopen.cpp: OS X defines __DARWIN_BYTE_ORDER, __DARWIN_BIG_ENDIAN, and + __DARWIN_LITTLE_ENDIAN rather than just __BYTE_ORDER, + __BIG_ENDIAN, and __LITTLE_ENDIAN, respectively, so we + #define the latter as their __DARWIN_ counterparts. + +Clean out mex files for Windows which were included for some reason. +<< << ------------------------------------------------------------------------------ Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET Get 100% visibility into your production application - at no cost. Code-level diagnostics for performance bottlenecks with <2% overhead Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap1 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs