[132228] trunk/dports/math/octave

[michaelld at macports.org]

Revision: 132228
          https://trac.macports.org/changeset/132228
Author:   michaelld at macports.org
Date:     2015-01-27 07:15:41 -0800 (Tue, 27 Jan 2015)
Log Message:
-----------
octave:
+ rename patch file to match usual naming practices;
+ use libc++ file patchfile;
+ fix and add comments about patches;
+ addresses ticket #45210.

Modified Paths:
--------------
    trunk/dports/math/octave/Portfile

Added Paths:
-----------
    trunk/dports/math/octave/files/patch-yosemite-libtool.diff

Removed Paths:
-------------
    trunk/dports/math/octave/files/yosemite-libtool.patch

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2015-01-26 23:13:50 UTC (rev 132227)
+++ trunk/dports/math/octave/Portfile	2015-01-27 15:15:41 UTC (rev 132228)
@@ -70,13 +70,31 @@
                     port:transfig \
                     port:pstoedit
 
+# Octave's build system does not produce universal binaries
+
 universal_variant   no
 
-# Don't link with "-flat_namespace -undefined suppress" on Yosemite and
-# later.
-patchfiles          yosemite-libtool.patch
+# Don't link with "-flat_namespace -undefined suppress"
+# on Mac OS X 10.10 Yosemite and later.
 
+patchfiles-append   patch-yosemite-libtool.diff
+
+# Fix certain versions of libc++ use of 'pow';
+# See also: < http://llvm.org/bugs/show_bug.cgi?id=21083 >
+#           < https://trac.macports.org/ticket/45210 >
+# Adding in this patch will not hurt when using a working
+# version of libcxx (< 1101), nor with using libstdcxx
+# (where _LIBCPP_VERSION is not defined).
+#
+# REMINDER: check without this patch when new libcxx
+# is available, to determine a stopping point for
+# when this issue was fixed; add that version to
+# the patch to "mx-inlines.cc".
+
+patchfiles-append   patch-clang-libcxx.diff
+
 # common configure arguments
+
 configure.args \
     --disable-dependency-tracking \
     --with-umfpack="-lumfpack -lSuiteSparse" \

Copied: trunk/dports/math/octave/files/patch-yosemite-libtool.diff (from rev 132211, trunk/dports/math/octave/files/yosemite-libtool.patch)
===================================================================
--- trunk/dports/math/octave/files/patch-yosemite-libtool.diff	                        (rev 0)
+++ trunk/dports/math/octave/files/patch-yosemite-libtool.diff	2015-01-27 15:15:41 UTC (rev 132228)
@@ -0,0 +1,13 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -21080,7 +21080,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
+       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+-	10.[012]*)
++	10.[012][,.]*)
+ 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 	10.*)
+ 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

Deleted: trunk/dports/math/octave/files/yosemite-libtool.patch
===================================================================
--- trunk/dports/math/octave/files/yosemite-libtool.patch	2015-01-26 23:13:50 UTC (rev 132227)
+++ trunk/dports/math/octave/files/yosemite-libtool.patch	2015-01-27 15:15:41 UTC (rev 132228)
@@ -1,13 +0,0 @@
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -21080,7 +21080,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
-       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--	10.[012]*)
-+	10.[012][,.]*)
- 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 	10.*)
- 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150127/1f7e2b79/attachment.html>