Alexander,

     The linkage problems on Yosemite can be solved in the octave-3.6.4 and
octave-3.8.2 packages with the following perl edit lines to adjust
configure rather than appending to the respective patches. Can you commit
this to 10.7 tree?

       Thanks in advance.

               Jack


--- octave-3.6.4.info.orig 2014-10-25 23:13:45.000000000 -0400

+++ octave-3.6.4.info 2014-10-27 01:17:15.000000000 -0400

@@ -2,7 +2,7 @@

 Package: octave%type_pkg[-blas]%type_pkg[-x11]

 Type: -blas (. -atlas -ref), oct (3.6.4), gcc (4.9), -x11 (boolean),
lapack (3.5.0)

 Version: 3.6.4

-Revision: 12

+Revision: 13

 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>



 BuildDepends: <<

@@ -178,6 +178,9 @@



  # instead of using flag-sort, ensure that the right sysdep.h is used

  grep -lr '#include "sysdep.h"' * | xargs perl -pi.orig -e
's,sysdep.h,%b/src/sysdep.h,'

+

+ # Patch configure to not link like Puma on Yosemite

+ perl -pi.bak -e 's|10\.\[012\]\*\)|10\.\[012\]\[\,\.\]\*\)|g' configure

 <<



 GCC: 4.0



--- octave-3.8.2.info.orig 2014-10-26 11:58:44.000000000 -0400

+++ octave-3.8.2.info 2014-10-27 01:18:27.000000000 -0400

@@ -2,7 +2,7 @@

 Package: octave%type_pkg[-blas]%type_pkg[-x11]%type_pkg[-qtui]

 Type: -blas (. -atlas -ref), oct (3.8.2), gcc (4.9), -x11 (boolean),
lapack (3.5.0), java (1.6), -qtui (. -qtmac -qtx11)

 Version: 3.8.2

-Revision: 3

+Revision: 4



 Description: MATLAB-like language for computations

 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>

@@ -147,6 +147,9 @@

  if [ $osversion -ge 13 ] ; then

  patch -p1 < %{PatchFile3}

  fi

+

+ # Patch configure to not link like Puma on Yosemite

+ perl -pi.bak -e 's|10\.\[012\]\*\)|10\.\[012\]\[\,\.\]\*\)|g' configure

 <<



 GCC: 4.0
------------------------------------------------------------------------------
_______________________________________________
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel

Reply via email to