[82161] trunk/dports/math/atlas

vince at macports.org vince at macports.org
Mon Aug 8 23:58:26 PDT 2011


Revision: 82161
          http://trac.macports.org/changeset/82161
Author:   vince at macports.org
Date:     2011-08-08 23:58:23 -0700 (Mon, 08 Aug 2011)
Log Message:
-----------
Update to version 3.9.46

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

Added Paths:
-----------
    trunk/dports/math/atlas/files/ar2
    trunk/dports/math/atlas/files/patch-ATL_AVgcc-fix.diff
    trunk/dports/math/atlas/files/patch-ATL_dmvnk_c.diff
    trunk/dports/math/atlas/files/patch-ATL_go_parallel_c.diff
    trunk/dports/math/atlas/files/patch-ATL_goparallel_prank_c.diff
    trunk/dports/math/atlas/files/patch-Make_ttune-i386.diff
    trunk/dports/math/atlas/files/patch-Make_ttune.diff
    trunk/dports/math/atlas/files/patch-Makefile_pthreads_misc.diff
    trunk/dports/math/atlas/files/patch-SpewMakeInc_c.diff
    trunk/dports/math/atlas/files/patch-archinfo_freebsd.c.diff
    trunk/dports/math/atlas/files/patch-atlas_l2g_base.diff
    trunk/dports/math/atlas/files/patch-atlcomp_txt.diff
    trunk/dports/math/atlas/files/patch-build-Make.top.diff
    trunk/dports/math/atlas/files/patch-make_ttune.diff
    trunk/dports/math/atlas/files/patch-threads-i386.diff

Removed Paths:
-------------
    trunk/dports/math/atlas/files/patch-ATL_AVgcc-fix.diff
    trunk/dports/math/atlas/files/patch-archinfo_freebsd.c.diff
    trunk/dports/math/atlas/files/patch-build-Make.top.diff

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2011-08-09 06:18:54 UTC (rev 82160)
+++ trunk/dports/math/atlas/Portfile	2011-08-09 06:58:23 UTC (rev 82161)
@@ -1,109 +1,147 @@
 # $Id$
 
-PortSystem          1.0
-PortGroup           muniversal 1.0
+PortSystem			1.0
+PortGroup			muniversal 1.0
 
-categories          math
-license             BSD
-name                atlas
-version             3.9.37
-#revision            4
+categories			math
+license				BSD
+name				atlas
+version				3.9.46
 
 # additional versions
-set lapackversion   3.3.0
-set lapackname      lapack
-set atlasdist       ${name}${version}.tar.bz2
-set lapackdist      ${lapackname}-${lapackversion}.tgz
+set lapackversion	3.3.1
+set lapackname		lapack
+set atlasdist		${name}${version}.tar.bz2
+set lapackdist		${lapackname}-${lapackversion}.tgz
 
-maintainers         jameskyle
-platforms           darwin
+maintainers			jameskyle
+platforms			darwin
 
-description         Portable optimal linear algebra software
-long_description    The current version provides a complete BLAS and LAPACK API.\
-                    For many operations, ATLAS achieves performance on par with\
-                    machine-specific tuned libraries.
+description			Portable optimal linear algebra software
+long_description	The current version provides a complete BLAS and LAPACK API.\
+					For many operations, ATLAS achieves performance on par with\
+					machine-specific tuned libraries.
 
-homepage            http://math-atlas.sourceforge.net/
+homepage			http://math-atlas.sourceforge.net/
 
-master_sites        sourceforge:math-atlas:atlas \
-                    http://www.netlib.org/lapack:lapack
+master_sites		sourceforge:math-atlas:atlas \
+					http://www.netlib.org/lapack:lapack
 
-distfiles           ${atlasdist}:atlas \
-                    ${lapackdist}:lapack
+distfiles			${atlasdist}:atlas \
+					${lapackdist}:lapack
 
-patchfiles          patch-SpewMakeInc.c.diff \
-					patch-emit_mm_c.diff \
-					patch-archinfo_freebsd_c.diff
+patchfiles			patch-SpewMakeInc_c.diff \
+					patch-archinfo_freebsd_c.diff \
+					patch-ATL_goparallel_prank_c.diff \
+					patch-ATL_go_parallel_c.diff \
+					patch-atlcomp_txt.diff \
+					patch-atlas_l2g_base.diff
 
-checksums           atlas${version}.tar.bz2 \
-                    sha1    71dd254dad1fc9ad3dec123a561706c9a1a5d7d1 \
-                    rmd160  87bb689e7a956df74ea4091552ac3cfd30430093 \
-                	lapack-${lapackversion}.tgz \
-                    md5     84213fca70936cc5f1b59a7b1bf71697 \
-                    sha1    4f0b103da52110e7f60d1d7676727103aca9785e \
-                	rmd160  cc72e7c93ab13464fd892d684b00b910cbbd3b3e
 
+checksums			atlas${version}.tar.bz2 \
+					sha1	aef8b696bc1bc50b304db953e2f20a653b783317 \
+					rmd160	1fbe0f403fc8a35b2b355edabc756c65c19befa2 \
+					lapack-${lapackversion}.tgz \
+					md5	 	d0d533ec9a5b74933c2a1e84eedc58b4 \
+					sha1	3ce437e05f0e9a3c8148ec41922f6efeef0ebdac \
+					rmd160	5e9d90122110045e07351f3ab30dc4e2b43d52db
 
-use_parallel_build  no
-build.target        build
-build.dir           ${workpath}/${name}-${version}/build
 
-variant gcc45 conflicts gcc42 gcc43 gcc44 description {build using macports-gcc-4.5} {}
-variant gcc44 conflicts gcc42 gcc43 description {build using macports-gcc-4.4} {}
-variant gcc43 conflicts gcc42 gcc44 conflicts universal description {build using macports-gcc-4.3} {}
-variant gcc42 conflicts gcc43 gcc44 conflicts universal description {build using macports-gcc-4.2} {}
+use_parallel_build	no
+build.target		build
+build.dir			${workpath}/${name}-${version}/build
 
-if { [variant_isset gcc42] } {
-  set gccversion    4.2
-} elseif { [variant_isset gcc43] } {
-  set gccversion    4.3
-} elseif { [variant_isset gcc45 ] } {
-  set gccversion    4.5
+variant gcc46 conflicts gcc42 gcc43 gcc44 gcc45 description {build using macports-gcc-4.6} {}
+variant gcc45 conflicts gcc42 gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {}
+variant gcc44 conflicts gcc42 gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {}
+variant gcc43 conflicts gcc42 gcc44 gcc45 gcc46 conflicts universal description {build using macports-gcc-4.3} {}
+variant gcc42 conflicts gcc43 gcc44 gcc45 gcc46 conflicts universal description {build using macports-gcc-4.2} {
+	ui_warn 'Use of gcc42 is deprecated. Please upgrade if possible'}
+
+if { ${os.major} < 11 || ![variant_isset dragonegg45] } {
+	if { [variant_isset gcc42] } {
+		set gccversion	4.2
+	} elseif { [variant_isset gcc43] } {
+		set gccversion	4.3
+	} elseif { [variant_isset gcc44] } {
+		set gccversion	4.4
+	} elseif { [variant_isset gcc45 ] } {
+		set gccversion	4.5
+	} elseif { [variant_isset gcc46] } {
+		set gccversion	4.6
+	} else {
+	default_variants	+gcc44
+	set gccversion		4.4
+	}
 } else {
-  default_variants +gcc44
-  set gccversion    4.4
+	# On Lion, we can also select clang and llvm-gcc42 since these compilers
+	# give performance at least as good as gcc.
+	# Fortran compiler remains gcc (dragonegg to come?)
+	if { [variant_isset gcc42] } {
+		set gccversion	4.2
+	} elseif { [variant_isset gcc43] } {
+		set gccversion	4.3
+	} elseif { [variant_isset gcc44] } {
+		set gccversion	4.4
+	} elseif { [variant_isset gcc45 ] } {
+		set gccversion	4.5
+	} elseif { [variant_isset gcc46] } {
+		return -code error "GCC/GFortran 4.6 is not yet available"
+	} elseif { [variant_isset dragonegg45] } {
+		configure.compiler	clang
+		configure.f77		${prefix}/bin/gfortran-mp-4.5
+	} else {
+		return -code error "GCC/GFortran 4.6 is not yet available"
+	}
 }
 
-set gccnumber       [join [split ${gccversion} .] ""]
+destroot.dir			${build.dir}
+destroot.destdir		DESTDIR=${destroot}${prefix}
+depends_lib				port:bzip2 \
+						port:gzip
 
-destroot.dir        ${build.dir}
-destroot.destdir    DESTDIR=${destroot}${prefix}
-depends_lib         port:gcc${gccnumber} \
-                    port:bzip2 \
-                    port:gzip
+if { [info exists gccversion] } {
+	set gccnumber		[join [split ${gccversion} .] ""]
+	configure.compiler	macports-gcc-${gccversion}
+	depends_lib-append	port:gcc${gccnumber}
+}
 
-if {[info exists depends_skip_archcheck]} {
-    depends_skip_archcheck gcc${gccnumber}
+if {[info exists depends_skip_archcheck] && [info exists gccversion]} {
+	depends_skip_archcheck gcc${gccnumber}
 }
 
-configure.compiler  macports-gcc-${gccversion}
-
-if { ${os.arch}=="i386" } {
-    set universal_archs_supported { i386 x86_64 }
+# No cross-compilation possible
+if { ${os.arch} == "i386" } {
+	set universal_archs_supported { i386 x86_64 }
 } else {
-    set universal_archs_supported { ppc  ppc64 }
+	set universal_archs_supported { ppc  ppc64 }
 }
 
 if {${build_arch} == "x86_64" || ${build_arch} == "ppc64" } {
-  set my_arch 64
+	set my_arch 64
 } else {
-  set my_arch 32
+	set my_arch 32
 }
 
-configure.args      -C xc ${configure.cc} \
-                    -C gc ${configure.cc} \
-                    -C if ${configure.f77} \
-                    -C ic ${configure.cc} \
-                    -C dm ${configure.cc} \
-                    -C sm ${configure.cc} \
-                    -C dk ${configure.cc} \
-                    -C sk ${configure.cc} \
-                    --cc=${configure.cc} \
-                    --with-netlib-lapack-tarfile=${distpath}/${lapackdist} \
-                    -O 12 \
-                    -b ${my_arch} \
-                    -Fa alg -fPIC
-                    
+configure.args		-C xc ${configure.cc} \
+					-C gc ${configure.cc} \
+					-C if ${configure.f77} \
+					-C ic ${configure.cc} \
+					-C dm ${configure.cc} \
+					-C sm ${configure.cc} \
+					-C dk ${configure.cc} \
+					-C sk ${configure.cc} \
+					--cc=${configure.cc} \
+					--with-netlib-lapack-tarfile=${distpath}/${lapackdist} \
+					-O 12 \
+					-b ${my_arch} \
+					-Fa alg -fPIC
+
+# Dragonegg
+if { [variant_isset dragonegg45] } {
+	configure.args-append -Fa if -fplugin=${prefix}/lib/dragonegg.so
+}
+
 # At this point, no threading for ppc/ppc64
 
 if {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
@@ -114,179 +152,177 @@
 # by Atlas, even if we are on a G5
 
 if {${build_arch} == "ppc" && ! [variant_isset universal]} {
-    configure.args-delete	--cc=${configure.cc} \
-    						-Fa alg -fPIC
+	configure.args-delete	--cc=${configure.cc} \
+							-Fa alg -fPIC
 
 	configure.args-append	--cc='${configure.cc} -m32' \
 							-A 4 \
-    						-Fa alg '-fPIC -m32'
-    
-    # On Leopard, we may warn the user that ppc is not as efficient as ppc64
-    if {${os.major} == 9} {
-    	if {[exec sysctl -n hw.cpu64bit_capable] == 1} {
-    		ui_msg	"--- Compiling for G4 arch (ppc) on a G5 (ppc64) machine."
-    		ui_msg	"--- This will lead to inferior performance."
-    	}
-    }
+							-Fa alg '-fPIC -m32'
+	
+	# On Leopard, we may warn the user that ppc is not as efficient as ppc64
+	if {${os.major} == 9} {
+		if {[exec sysctl -n hw.cpu64bit_capable] == 1} {
+			ui_msg "--- Compiling for G4 arch (ppc) on a G5 (ppc64) machine."
+			ui_msg "--- This will lead to inferior performance."
+		}
+	}
+		
 }
 
+if { ${os.major} == 11 && \
+	[exec sysctl -n hw.optional.avx1_0] == 1 } {
+	# Corei2 is not supported yet because gcc4.5 does not
+	# support AVX instructions and gcc4.6 does not compile yet.
+	# Set CPU to Corei1 instead
+	configure.args-append -A 18
+}
+
 if { [variant_isset universal] } {
-    configure.universal_args-delete --disable-dependency-tracking
-    configure.args-delete	--cc=${configure.cc} \
-    						-b ${my_arch} \
-    						-Fa alg -fPIC
-                    
-    lappend merger_configure_args(ppc)		--cc='${configure.cc} -m32' \
-    										-b 32 \
-    										-A 4 \
+	configure.universal_args-delete			--disable-dependency-tracking
+	configure.args-delete					--cc=${configure.cc} \
+											-b ${my_arch} \
+											-Fa alg -fPIC
+					
+	lappend merger_configure_args(ppc)		--cc='${configure.cc} -m32' \
+											-b 32 \
+											-A 4 \
 											-t 0 \
-    										-s gas_ppc \
-    										-Fa alg '-fPIC -m32'
-    lappend merger_configure_args(ppc64)	--cc='${configure.cc} -m64' \
-    										-b 64 \
-    										-A 5 \
+											-s gas_ppc \
+											-Fa alg '-fPIC -m32'
+	lappend merger_configure_args(ppc64)	--cc='${configure.cc} -m64' \
+											-b 64 \
+											-A 5 \
 											-t 0 \
-    										-s gas_ppc \
-    										-Fa alg '-fPIC -m64'
-    lappend merger_configure_args(i386) 	--cc='${configure.cc} -m32' \
-    										-b 32 \
-    										-s gas_x86_32 \
-    										-Fa alg '-fPIC -m32'
-    lappend merger_configure_args(x86_64) 	--cc='${configure.cc} -m64' \
-    										-b 64 \
-    										-s gas_x86_64 \
-    										-Fa alg '-fPIC -m64'
+											-s gas_ppc \
+											-Fa alg '-fPIC -m64'
+	lappend merger_configure_args(i386) 	--cc='${configure.cc} -m32' \
+											-b 32 \
+											-s gas_x86_32 \
+											-Fa alg '-fPIC -m32'
+	lappend merger_configure_args(x86_64) 	--cc='${configure.cc} -m64' \
+											-b 64 \
+											-s gas_x86_64 \
+											-Fa alg '-fPIC -m64'
 } else {
-    lappend merger_configure_args(ppc)
-    lappend merger_configure_args(ppc64)
-    lappend merger_configure_args(i386)
-    lappend merger_configure_args(x86_64)
+	lappend merger_configure_args(ppc)
+	lappend merger_configure_args(ppc64)
+	lappend merger_configure_args(i386)
+	lappend merger_configure_args(x86_64)
 }
 
-build.env-append    "CC=${configure.cc} CXX=${configure.cxx}"
+build.env-append	"CC=${configure.cc} CXX=${configure.cxx}"
 
 # we are configuring from the build directory
-configure.dir       ${workpath}/${name}-${version}/build
-configure.cmd       ../configure
+configure.dir			${workpath}/${name}-${version}/build
+configure.cmd			../configure
 
 
 # change the default compilers to those of gcc and make into shared library
 extract {
-    # extract atlas and move to a consistent working directory name
-    system "cd ${workpath} && bunzip2 -dc ${distpath}/${atlasdist} | \
-         gnutar --no-same-owner -xf -"
-    system "mv ${workpath}/ATLAS ${workpath}/${name}-${version}"
+	# extract atlas and move to a consistent working directory name
+	system	"cd ${workpath} && bunzip2 -dc ${distpath}/${atlasdist} | \
+			 gnutar --no-same-owner -xf -"
+	system	"mv ${workpath}/ATLAS ${workpath}/${name}-${version}"
 }
 
 post-patch {
-    	reinplace "s|__MACPORTS_GCC__|${configure.cc}|g" \
-    		${workpath}/${name}-${version}/CONFIG/src/SpewMakeInc.c
+	reinplace	"s|__MACPORTS_GCC__|${configure.cc}|g" \
+				 ${workpath}/${name}-${version}/CONFIG/src/SpewMakeInc.c
+	
+	# ar -r / ranlib / libtool seems to be buggy, so we have to supply a
+	# workaround to link properly.
+	reinplace	"s|XXXXX|${filespath}/ar2|" \
+				${workpath}/${name}-${version}/CONFIG/src/SpewMakeInc.c
 }
 
-# Bug in 3.9.37
-proc bug3_9_37 {arch path} {
-    switch ${arch} {
-    	
-    	x86_64 {
-    		reinplace -E \
-    			"s|ATL_thread_exit.o ATL_thread_join.o|\
-    			ATL_thread_exit.o ATL_thread_join.o\
-    			ATL_DecAtomicCount_amd64.o|" ${path}
-    	}
-    		
-    	i386 {
-    		reinplace -E \
-    			"s|ATL_thread_exit.o ATL_thread_join.o|\
-				ATL_thread_exit.o ATL_thread_join.o\
-   				ATL_DecAtomicCount_ia32.o|" ${path}
-    	}
+pre-configure {
 
-    	ppc64 {
-    		reinplace -E \
-    			"s|ATL_thread_exit.o ATL_thread_join.o|\
-    			ATL_thread_exit.o ATL_thread_join.o\
-    			ATL_DecAtomicCount_ppc.o|" ${path}
-    	}
-
-    	ppc {
-    		reinplace -E \
-    			"s|ATL_thread_exit.o ATL_thread_join.o|\
-    			ATL_thread_exit.o ATL_thread_join.o\
-    			ATL_DecAtomicCount_ppc.o|" ${path}
-    	}
+	# i386 builds must be patch otherwise threading does not work.
+	if { [variant_isset universal] } {
+		foreach arch ${universal_archs_to_use} {
+			copy ${workpath}/${name}-${version} \
+			 ${workpath}/${name}-${version}-${arch}
+			if { ${arch} == "i386" } {
+				ui_msg	"Patching Make.ttune for i386 universal build"
+				system	"cd ${workpath}/${name}-${version}-i386/makes && \
+						 patch < ${filespath}/patch-Make_ttune-i386.diff"
+			}
+		}
 	}
-}
+	
+	if { ${build_arch} == "i386" && ! [variant_isset universal] } {
+		ui_msg	"Patching Make.ttune for i386 build"
+		system	"cd ${workpath}/${name}-${version}/makes && \
+				 patch < ${filespath}/patch-Make_ttune-i386.diff"
+	}
 
-pre-configure {
-    if { [variant_isset universal] } {
-        foreach arch ${universal_archs_to_use} {
-            copy ${workpath}/${name}-${version} ${workpath}/${name}-${version}-${arch}
-        }
-    }
+	reinplace	"s|cc=gcc|cc=${configure.cc}|g" ${worksrcpath}/configure
+	reinplace	"s|-no-cpp-precomp||g" \
+				 ${workpath}/${name}-${version}/CONFIG/src/atlcomp.txt
 
-    reinplace "s|cc=gcc|cc=${configure.cc}|g" ${worksrcpath}/configure
-    reinplace "s|-no-cpp-precomp||g" ${workpath}/${name}-${version}/CONFIG/src/atlcomp.txt
+	# Get some system specific variables for maximum optimization
+	set			cpufreq [expr {[exec sysctl -n hw.cpufrequency]/1000000}]
+	ui_debug	"Setting CPU Frequency for: ${cpufreq}"
 
-    # Get some system specific variables for maximum optimization
-    set cpufreq [expr {[exec sysctl -n hw.cpufrequency]/1000000}]
-    ui_debug "Setting CPU Frequency for: ${cpufreq}"
+	if { ${os.arch} == "powerpc" } {
+		configure.args-append	-D c -DWALL
+	} else {
+		configure.args-append	-D c -DPentiumCPS=${cpufreq}
+	}
 
-    if {[string equal "${os.arch}" "powerpc"]} {
-      configure.args-append -D c -DWALL
-    } else {
-      configure.args-append -D c -DPentiumCPS=${cpufreq}
-    }
+	if { [variant_isset universal] } {
+		set	archs ${universal_archs_to_use}
+	} else {
+		set	archs ${build_arch}
+	}
 
-    if { [variant_isset universal] } {
-        set archs ${universal_archs_to_use}
-    } else {
-        set archs ${build_arch}
-    }
+	foreach arch ${archs} {
+		if { ! [variant_isset universal] } {
+			set	atlas_path ${workpath}/${name}-${version}
+		} else {
+			set	atlas_path ${workpath}/${name}-${version}-${arch}
+		}
 
-    foreach arch ${archs} {
-
-    	if { ! [variant_isset universal] } {
-        set atlas_path  ${workpath}/${name}-${version}
-    	} else {
-        set atlas_path ${workpath}/${name}-${version}-${arch}
-    	}
-    	
-    	file mkdir ${atlas_path}/build
-    	
-    	# Correct a bug in 3.9.37
-    	set mkt ${atlas_path}/makes/Make.thr
-    	bug3_9_37 ${arch} ${mkt}
+		file mkdir ${atlas_path}/build
 	}
 }
 
 post-configure {
-    if { [variant_isset universal] } {
-        set archs ${universal_archs_to_use}
-    } else {
-        set archs ${build_arch}
-    }
+	if { [variant_isset universal] } {
+		set	archs ${universal_archs_to_use}
+	} else {
+		set	archs ${build_arch}
+	}
 
-    foreach arch ${archs} {
-        if { ! [variant_isset universal] } {
-            set atlas_path  ${workpath}/${name}-${version}
-        } else {
-            set atlas_path ${workpath}/${name}-${version}-${arch}
-        }
+	foreach arch ${archs} {
+		if { ! [variant_isset universal] } {
+			set	atlas_path ${workpath}/${name}-${version}
+		} else {
+			set	atlas_path ${workpath}/${name}-${version}-${arch}
+		}
 
-    # recursively remove directories
-    ui_debug "reinplace for make to recursively remove directories on clean"
-    reinplace "s|rm -f|rm -rf|g" ${atlas_path}/build/Makefile
-    }
+		# recursively remove directories
+		ui_debug	"patch to recursively remove directories on clean"
+		reinplace	"s|rm -f|rm -rf|g" ${atlas_path}/build/Makefile
+
+		#Second patch for i386
+		if { ${arch} == "i386" } {
+			system	"cd ${atlas_path}/build/src/threads && \
+					 patch < ${filespath}/patch-threads-i386.diff"
+			system	"cd ${atlas_path}/build/src/pthreads/misc && \
+					 patch < ${filespath}/patch-Makefile_pthreads_misc.diff"
+		}
+	}
 }
 
 proc make_dylib { lib lib_dir arch libs } {
-    global destroot prefix gccnumber
-    system "cd ${lib_dir} && \
-            ( test ! -e ${lib}.a || \
-              /usr/bin/ld -arch ${arch} -dynamic -dylib -single_module -dead_strip \
-              -x -all_load -L. -L${prefix}/lib/gcc${gccnumber}/${arch} \ -L${prefix}/lib/gcc${gccnumber} -ldylib1.o \
-              -dylib_install_name ${prefix}/lib/${lib}.dylib \
-              ${lib}.a -o ${lib}.dylib ${libs} )"
+	global destroot prefix gccnumber
+	system "cd ${lib_dir} && \
+			( test ! -e ${lib}.a || \
+			  /usr/bin/ld -arch ${arch} -dynamic -dylib -single_module -dead_strip \
+			  -x -all_load -L. -L${prefix}/lib/gcc${gccnumber}/${arch} \ -L${prefix}/lib/gcc${gccnumber} -ldylib1.o \
+			  -dylib_install_name ${prefix}/lib/${lib}.dylib \
+			  ${lib}.a -o ${lib}.dylib ${libs} )"
 }
 
 post-build {
@@ -294,65 +330,65 @@
 
   set ncpu [exec sysctl -n hw.ncpu]
 
-    if { [variant_isset universal] } {
-        set archs ${universal_archs_to_use}
-    } else {
-        set archs ${build_arch}
-    }
+	if { [variant_isset universal] } {
+		set	archs ${universal_archs_to_use}
+	} else {
+		set	archs ${build_arch}
+	}
 
-    foreach arch ${archs} {
-        if { ! [variant_isset universal] } {
-            set atlas_path  ${workpath}/${name}-${version}
-        } else {
-            set atlas_path ${workpath}/${name}-${version}-${arch}
-        }
-        set lib_dir ${atlas_path}/build/lib
+	foreach arch ${archs} {
+		if { ! [variant_isset universal] } {
+			set	atlas_path  ${workpath}/${name}-${version}
+		} else {
+			set	atlas_path ${workpath}/${name}-${version}-${arch}
+		}
 
-  make_dylib libatlas ${lib_dir} ${arch} { -lSystem }
+		set			lib_dir ${atlas_path}/build/lib
+		make_dylib	libatlas ${lib_dir} ${arch} { -lSystem }
 
-  if {${ncpu} == "1" } {
-    # there are no threaded libraries (libpt*) on single-core machines
-    make_dylib libcblas   ${lib_dir} ${arch} { -latlas -lSystem }
-    make_dylib libf77blas ${lib_dir} ${arch} { -lgfortran -latlas -lSystem }
-  } else {
-    make_dylib libptcblas   ${lib_dir} ${arch} { -latlas -lSystem }
-    make_dylib libptf77blas ${lib_dir} ${arch} { -lgfortran -latlas -lSystem }
-  }
+		if { ${ncpu} == "1" } {
+	# there are no threaded libraries (libpt*) on single-core machines
+			make_dylib	libcblas   ${lib_dir} ${arch} { -latlas -lSystem }
+			make_dylib	libf77blas ${lib_dir} ${arch} { -lgfortran -latlas -lSystem }
+		} else {
+			make_dylib	libptcblas   ${lib_dir} ${arch} { -latlas -lSystem }
+			make_dylib	libptf77blas ${lib_dir} ${arch} { -lgfortran -latlas -lSystem }
+		}
 
-  make_dylib liblapack ${lib_dir} ${arch} { -lf77blas -lcblas -latlas -lgfortran -lgcc_s.1 -lSystem }
+		make_dylib	liblapack ${lib_dir} ${arch} { -lf77blas -lcblas -latlas -lgfortran -lgcc_s.1 -lSystem }
+	}
 }
-}
 
 pre-destroot {
-   if { [variant_isset universal] } {
-        set archs ${universal_archs_to_use}
-    } else {
-        set archs ${build_arch}
-    }
+	if { [variant_isset universal] } {
+		set	archs ${universal_archs_to_use}
+	} else {
+		set	archs ${build_arch}
+	}
 
-    foreach arch ${archs} {
-        if { ! [variant_isset universal] } {
-            set atlas_path  ${workpath}/${name}-${version}
-            set dest_path   ${destroot}${prefix}/lib/
-        } else {
-            set atlas_path ${workpath}/${name}-${version}-${arch}
-            set dest_path  ${destroot}-${arch}${prefix}/lib/
-        }
-        set lib_dir ${atlas_path}/build/lib
+	foreach arch ${archs} {
+		if { ! [variant_isset universal] } {
+			set	atlas_path  ${workpath}/${name}-${version}
+			set	dest_path   ${destroot}${prefix}/lib/
+		} else {
+			set	atlas_path ${workpath}/${name}-${version}-${arch}
+			set	dest_path  ${destroot}-${arch}${prefix}/lib/
+		}
 
-        file mkdir ${dest_path}
-        eval xinstall -m 755 [glob ${lib_dir}/*.dylib] ${dest_path}
-    }
+		set		lib_dir ${atlas_path}/build/lib
+		file	mkdir ${dest_path}
+		eval	xinstall -m 755 [glob ${lib_dir}/*.dylib] ${dest_path}
+	}
 }
 
 post-destroot {
-    if { ![file exists ${destroot}${prefix}/lib/libcblas.dylib] && [file exists ${destroot}${prefix}/lib/libptcblas.dylib]} {
-        ln -s libptcblas.dylib ${destroot}${prefix}/lib/libcblas.dylib
-    }
-    if { ![file exists ${destroot}${prefix}/lib/libf77blas.dylib] && [file exists ${destroot}${prefix}/lib/libptf77blas.dylib]} {
-        ln -s libptf77blas.dylib ${destroot}${prefix}/lib/libf77blas.dylib
-    }
+	if { ![file exists ${destroot}${prefix}/lib/libcblas.dylib] && [file exists ${destroot}${prefix}/lib/libptcblas.dylib]} {
+		ln -s libptcblas.dylib ${destroot}${prefix}/lib/libcblas.dylib
+	}
+	if { ![file exists ${destroot}${prefix}/lib/libf77blas.dylib] && [file exists ${destroot}${prefix}/lib/libptf77blas.dylib]} {
+		ln -s libptf77blas.dylib ${destroot}${prefix}/lib/libf77blas.dylib
+	}
 }
 
-livecheck.name      math-atlas
-livecheck.distname  Stable
+livecheck.name		math-atlas
+livecheck.distname	Stable

Added: trunk/dports/math/atlas/files/ar2
===================================================================
--- trunk/dports/math/atlas/files/ar2	                        (rev 0)
+++ trunk/dports/math/atlas/files/ar2	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,24 @@
+#!/bin/sh
+#Simulates ar r with libtool
+
+#If another option is given, just call ar and bail out
+if [ $1 != 'r' ]; then
+	ar $@
+	exit $?
+fi
+
+#Skips the first two arguments (r libname)
+libname=$2
+shift
+shift
+
+#All objects name are collected in $obj
+if [ -e $libname ]; then
+	ar d $libname $@
+    mv $libname $libname.tmp
+    libtool -static -o $libname $libname.tmp $@
+	rm $libname.tmp
+	ranlib $libname
+else
+	libtool -static -o $libname $@
+fi


Property changes on: trunk/dports/math/atlas/files/ar2
___________________________________________________________________
Added: svn:executable
   + *

Deleted: trunk/dports/math/atlas/files/patch-ATL_AVgcc-fix.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-ATL_AVgcc-fix.diff	2011-08-09 06:18:54 UTC (rev 82160)
+++ trunk/dports/math/atlas/files/patch-ATL_AVgcc-fix.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -1,17 +0,0 @@
---- CONFIG/src/SpewMakeInc.c.orig	2009-02-18 19:47:37.000000000 +0100
-+++ CONFIG/src/SpewMakeInc.c	2009-12-15 22:05:56.000000000 +0100
-@@ -579,11 +579,11 @@
- /*
-  * Need up update handling of apple vs. gnu gcc for altivec
-  */
--#if 0
-+/*#if 0
-    if (ISAX == ISA_AV && strstr(CC, "gcc") && strstr(MCC, "gcc") &&
--       !GccIsApple(CC))
-+       !GccIsApple(CC))*/
-       fprintf(fpout, " -DATL_%s -DATL_AVgcc", ISAXNAM[ISAX]);
--#endif
-+/*#endif*/
-    fprintf(fpout, "\n\n");
- 
-    fprintf(fpout,

Added: trunk/dports/math/atlas/files/patch-ATL_AVgcc-fix.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-ATL_AVgcc-fix.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-ATL_AVgcc-fix.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,17 @@
+--- CONFIG/src/SpewMakeInc.c.orig	2009-02-18 19:47:37.000000000 +0100
++++ CONFIG/src/SpewMakeInc.c	2009-12-15 22:05:56.000000000 +0100
+@@ -579,11 +579,11 @@
+ /*
+  * Need up update handling of apple vs. gnu gcc for altivec
+  */
+-#if 0
++/*#if 0
+    if (ISAX == ISA_AV && strstr(CC, "gcc") && strstr(MCC, "gcc") &&
+-       !GccIsApple(CC))
++       !GccIsApple(CC))*/
+       fprintf(fpout, " -DATL_%s -DATL_AVgcc", ISAXNAM[ISAX]);
+-#endif
++/*#endif*/
+    fprintf(fpout, "\n\n");
+ 
+    fprintf(fpout,

Added: trunk/dports/math/atlas/files/patch-ATL_dmvnk_c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-ATL_dmvnk_c.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-ATL_dmvnk_c.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,11 @@
+--- build/tune/blas/gemv/ATL_dmvnk.c.orig	2011-07-24 13:50:01.000000000 +0200
++++ build/tune/blas/gemv/ATL_dmvnk.c	2011-07-24 13:50:29.000000000 +0200
+@@ -109,7 +109,7 @@
+    movl   $3*8, -56(%rsp)       /* mem = MU */
+    fildl  -56(%rsp)                     /* ST = MU */
+    movl   %edi, -56(%rsp)               /* mem = M */
+-   fidivr -56(%rsp)                     /* ST = M/MU */
++   fidivrl -56(%rsp)                     /* ST = M/MU */
+    fisttpl -60(%rsp)                    /* mem = TRUNC(M/MU) */
+    movl    -60(%rsp), %ebx              /* rbx = TRUNC(M/MU) */
+    imul    $3*8, %ebx, %ebx     /* rbx = MU*TRUNC(M/MU) */

Added: trunk/dports/math/atlas/files/patch-ATL_go_parallel_c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-ATL_go_parallel_c.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-ATL_go_parallel_c.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,21 @@
+--- src/threads/ATL_goparallel.c.orig	2011-04-29 19:18:55.000000000 +0200
++++ src/threads/ATL_goparallel.c	2011-04-30 08:35:51.000000000 +0200
+@@ -1,4 +1,5 @@
+ #ifndef ATL_NOAFFINITY
++   #define DONT
+    #include "atlas_taffinity.h"  /* include this file first! */
+ #endif
+ #include "atlas_misc.h"
+@@ -63,8 +64,10 @@
+ #endif
+ #if defined(ATL_TUNING) && defined(ATL_NOAFFINITY)
+    void *ATL_log2tlaunch_noaff(void *vp);
+-   #define ATL_goparallel ATL_goparallel_noaff
+-   #define ATL_dyntlaunch ATL_log2tlaunch_noaff
++	#ifndef DONT
++   		#define ATL_goparallel ATL_goparallel_noaff
++   		#define ATL_dyntlaunch ATL_log2tlaunch_noaff
++   	#endif
+    #define ATL_USE_DYNAMIC 0
+ #elif defined(ATL_TUNING)
+    #if defined(ATL_LAUNCH_LINEAR)

Added: trunk/dports/math/atlas/files/patch-ATL_goparallel_prank_c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-ATL_goparallel_prank_c.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-ATL_goparallel_prank_c.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,20 @@
+--- src/threads/ATL_goparallel_prank.c.orig	2011-05-03 16:09:03.000000000 +0200
++++ src/threads/ATL_goparallel_prank.c	2011-05-03 16:10:37.000000000 +0200
+@@ -7,14 +7,16 @@
+ 
+   int myRetn=-1;
+   __asm__ __volatile__ ("\n"
++	"movl %%ebx,(%%esp)\n"
+     "movl $1, %%eax\n"
+     "cpuid\n"
+     "shrl $24, %%ebx\n"
+     "movl %%ebx, %0\n"
++	"movl (%%esp),%%ebx\n"
+     : "=m" (myRetn)
+     :
+ #if defined(ATL_GAS_x8632)
+-    :"%eax", "%ebx", "%edx", "%ecx"
++    :"%eax", "%edx", "%ecx"
+ #elif defined(ATL_GAS_x8664)
+     :"%rax", "%rbx", "%rdx", "%rcx"
+ #endif

Added: trunk/dports/math/atlas/files/patch-Make_ttune-i386.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-Make_ttune-i386.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-Make_ttune-i386.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,27 @@
+--- Make.ttune.orig	2011-07-31 08:03:24.000000000 +0200
++++ Make.ttune	2011-07-31 08:05:13.000000000 +0200
+@@ -125,22 +125,14 @@
+            $(MAKE) iFind_atomic_arch ; \
+         fi
+ iFind_atomic_arch :
+-	if $(MAKE) xprobe_atomic_amd64 ; then \
+-           cp $(myTHRdir)/ATL_*AtomicCount_arch.c . ; \
+-           cp $(myTHRdir)/ATL_ResetAtomicCount_amd64.S \
+-              ATL_ResetAtomicCount_arch.S ; \
+-           cp $(myTHRdir)/ATL_DecAtomicCount_amd64.S \
+-              ATL_DecAtomicCount_arch.S ; \
+-           rm $(BLDdir)/src/threads/atomic.inc ; \
+-           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_amd64.o ATL_DecAtomicCount_amd64.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
+-	elif $(MAKE) xprobe_atomic_ia32 ; then \
++	if $(MAKE) xprobe_atomic_ia32 ; then \
+            cp $(myTHRdir)/ATL_*AtomicCount_arch.c . ; \
+            cp $(myTHRdir)/ATL_ResetAtomicCount_ia32.S \
+               ATL_ResetAtomicCount_arch.S ; \
+            cp $(myTHRdir)/ATL_DecAtomicCount_ia32.S \
+               ATL_DecAtomicCount_arch.S ; \
+            rm $(BLDdir)/src/threads/atomic.inc ; \
+-           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_ia32.o ATL_DecAtomicCount_ia32.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
++           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_ia32.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
+ 	elif $(MAKE) xprobe_atomic_ppc ; then \
+            cp $(myTHRdir)/ATL_*AtomicCount_arch.c . ; \
+            cp $(myTHRdir)/ATL_ResetAtomicCount_ppc.S \

Added: trunk/dports/math/atlas/files/patch-Make_ttune.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-Make_ttune.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-Make_ttune.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,12 @@
+--- makes/Make.ttune.orig	2011-05-03 10:29:43.000000000 +0200
++++ makes/Make.ttune	2011-05-03 10:29:46.000000000 +0200
+@@ -197,7 +197,8 @@
+              ATL_thread_start_noaff.o ATL_thread_start.o
+ 	$(CC) $(CCFLAGS) -o xtune_aff tune_aff.o ATL_goparallel_noaff.o \
+               ATL_goparallel_aff.o ATL_log2tlaunch_noaff.o ATL_log2tlaunch.o \
+-              ATL_thread_start_noaff.o ATL_thread_start.o $(ATLASlib) $(LIBS)
++              ATL_thread_start_noaff.o ATL_thread_start.o \
++			  -Wl,-undefined,suppress,-flat_namespace $(ATLASlib) $(LIBS)
+ 
+ ATL_goparallel_aff.o : $(myTHRdir)/ATL_goparallel.c
+ 	$(CC) $(CCFLAGS) -o $@ -DATL_TUNING -c $(myTHRdir)/ATL_goparallel.c

Added: trunk/dports/math/atlas/files/patch-Makefile_pthreads_misc.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-Makefile_pthreads_misc.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-Makefile_pthreads_misc.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,11 @@
+--- Makefile.orig	2011-08-01 09:02:42.000000000 +0200
++++ Makefile	2011-08-01 09:04:08.000000000 +0200
+@@ -86,7 +86,7 @@
+ zlvlm : zlib
+ #
+ alib  : alib.grd
+-slib  : slib.grd
++slib  : slib.grd alib.grd
+ dlib  : dlib.grd
+ clib  : clib.grd
+ zlib  : zlib.grd

Added: trunk/dports/math/atlas/files/patch-SpewMakeInc_c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-SpewMakeInc_c.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-SpewMakeInc_c.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,22 @@
+--- CONFIG/src/SpewMakeInc.c.orig	2011-07-24 15:00:11.000000000 +0200
++++ CONFIG/src/SpewMakeInc.c	2011-07-24 15:00:55.000000000 +0200
+@@ -679,7 +679,7 @@
+           comps[i][j-2] == 'c' && comps[i][j-1] == 'c')
+          break;
+    }
+-   goodgcc = (i < NCOMP) ? comps[i] : "gcc";
++   goodgcc = "__MACPORTS_GCC__";
+    fprintf(fpout, "   GOODGCC = %s", goodgcc);
+    if (gccflags)
+       fprintf(fpout, " %s", gccflags);
+@@ -727,8 +727,8 @@
+    if (OS == OSWinNT && ptrbits == 64)
+       fprintf(fpout, "\n   ARCHIVER = $(BLDdir)/mgwar\n");
+    else
+-      fprintf(fpout, "\n   ARCHIVER = ar\n");
+-   fprintf(fpout, "   ARFLAGS  = r\n");
++      fprintf(fpout, "\n   ARCHIVER = XXXXX\n");
++   fprintf(fpout, "   ARFLAGS  = r\n");
+ /*
+  * JF Mertens says that even x86 OS X still need ranlib for safety
+  */

Deleted: trunk/dports/math/atlas/files/patch-archinfo_freebsd.c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-archinfo_freebsd.c.diff	2011-08-09 06:18:54 UTC (rev 82160)
+++ trunk/dports/math/atlas/files/patch-archinfo_freebsd.c.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -1,11 +0,0 @@
---- CONFIG/src/backend/archinfo_freebsd.c.orig	2009-02-18 18:47:37.000000000 +0000
-+++ CONFIG/src/backend/archinfo_freebsd.c	2010-01-01 11:45:22.000000000 +0000
-@@ -69,7 +69,7 @@
-             if (strstr(res,"c1,2")||strstr(res,"c3,1")||strstr(res,"c3,2")||
-                 strstr(res,"c3,3")||strstr(res,"c3,4")||strstr(res,"c3,5")||
-                 strstr(res,"c3,6")||strstr(res,"c4,2")||strstr(res,"c4,5")||
--                strstr(res,"c5,1"))
-+                strstr(res,"c5,1")||strstr(res,"c10,1"))
-                mach = PPCG4;
-             else if (strstr(res,"c11,2")|| strstr(res,"c12,1")||
-                      strstr(res,"c7,2") || strstr(res,"c7,3") ||

Added: trunk/dports/math/atlas/files/patch-archinfo_freebsd.c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-archinfo_freebsd.c.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-archinfo_freebsd.c.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,11 @@
+--- CONFIG/src/backend/archinfo_freebsd.c.orig	2009-02-18 18:47:37.000000000 +0000
++++ CONFIG/src/backend/archinfo_freebsd.c	2010-01-01 11:45:22.000000000 +0000
+@@ -69,7 +69,7 @@
+             if (strstr(res,"c1,2")||strstr(res,"c3,1")||strstr(res,"c3,2")||
+                 strstr(res,"c3,3")||strstr(res,"c3,4")||strstr(res,"c3,5")||
+                 strstr(res,"c3,6")||strstr(res,"c4,2")||strstr(res,"c4,5")||
+-                strstr(res,"c5,1"))
++                strstr(res,"c5,1")||strstr(res,"c10,1"))
+                mach = PPCG4;
+             else if (strstr(res,"c11,2")|| strstr(res,"c12,1")||
+                      strstr(res,"c7,2") || strstr(res,"c7,3") ||

Added: trunk/dports/math/atlas/files/patch-atlas_l2g_base.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-atlas_l2g_base.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-atlas_l2g_base.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,11 @@
+--- tune/blas/gemv/atlas-l2g.base.orig	2011-07-24 14:32:15.000000000 +0200
++++ tune/blas/gemv/atlas-l2g.base	2011-07-24 14:32:32.000000000 +0200
+@@ -1577,7 +1577,7 @@
+    movl   $@(MU)*@(CL), -56(%rsp)       /* mem = MU */
+    fildl  -56(%rsp)                     /* ST = MU */
+    movl   %edi, -56(%rsp)               /* mem = M */
+-   fidivr -56(%rsp)                     /* ST = M/MU */
++   fidivrl -56(%rsp)                     /* ST = M/MU */
+    fisttpl -60(%rsp)                    /* mem = TRUNC(M/MU) */
+    movl    -60(%rsp), %ebx              /* rbx = TRUNC(M/MU) */
+    imul    $@(MU)*@(CL), %ebx, %ebx     /* rbx = MU*TRUNC(M/MU) */

Added: trunk/dports/math/atlas/files/patch-atlcomp_txt.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-atlcomp_txt.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-atlcomp_txt.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,11 @@
+--- CONFIG/src/atlcomp.txt.orig	2011-07-24 12:01:11.000000000 +0200
++++ CONFIG/src/atlcomp.txt	2011-07-24 12:01:39.000000000 +0200
+@@ -51,6 +51,8 @@
+    'gcc-4' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2'
+ MACH=Core2 OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc
+    'gcc' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2'
++MACH=Core2 OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc,xcc
++   'clang' '-fomit-frame-pointer -msse3 -O2'
+ # PPRO,PII,PIII,P4,P4E,K7,HAMMER
+ MACH=PPRO,PII,PIII,P4,P4E,K7,HAMMER OS=ALL LVL=1000 COMPS=f77
+    'gfortran' '-fomit-frame-pointer -mfpmath=387 -O2 -falign-loops=4'

Deleted: trunk/dports/math/atlas/files/patch-build-Make.top.diff
===================================================================
Added: trunk/dports/math/atlas/files/patch-build-Make.top.diff
===================================================================
Added: trunk/dports/math/atlas/files/patch-make_ttune.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-make_ttune.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-make_ttune.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,12 @@
+--- makes/Make.ttune.orig	2011-05-03 10:29:43.000000000 +0200
++++ makes/Make.ttune	2011-05-03 10:29:46.000000000 +0200
+@@ -197,7 +197,8 @@
+              ATL_thread_start_noaff.o ATL_thread_start.o
+ 	$(CC) $(CCFLAGS) -o xtune_aff tune_aff.o ATL_goparallel_noaff.o \
+               ATL_goparallel_aff.o ATL_log2tlaunch_noaff.o ATL_log2tlaunch.o \
+-              ATL_thread_start_noaff.o ATL_thread_start.o $(ATLASlib) $(LIBS)
++              ATL_thread_start_noaff.o ATL_thread_start.o \
++			  -Wl,-undefined,suppress,-flat_namespace $(ATLASlib) $(LIBS)
+ 
+ ATL_goparallel_aff.o : $(myTHRdir)/ATL_goparallel.c
+ 	$(CC) $(CCFLAGS) -o $@ -DATL_TUNING -c $(myTHRdir)/ATL_goparallel.c

Added: trunk/dports/math/atlas/files/patch-threads-i386.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-threads-i386.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-threads-i386.diff	2011-08-09 06:58:23 UTC (rev 82161)
@@ -0,0 +1,12 @@
+--- Makefile.orig	2011-07-30 14:38:58.000000000 +0200
++++ Makefile	2011-07-30 14:39:47.000000000 +0200
+@@ -12,7 +12,8 @@
+       ATL_ResetGlobalAtomicCount.o ATL_SetGlobalAtomicCount.o \
+       ATL_thread_yield.o ATL_mutex_free.o ATL_mutex_trylock.o \
+       ATL_mutex_unlock.o ATL_mutex_lock.o ATL_mutex_init.o ATL_goparallel.o \
+-      ATL_thread_start.o ATL_thread_exit.o ATL_thread_join.o
++      ATL_thread_start.o ATL_thread_exit.o ATL_thread_join.o \
++      ATL_DecAtomicCount_ia32.o
+ 
+ all : lib
+ lib : lib.grd l3thr l2thr
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110808/94f25288/attachment-0001.html>


More information about the macports-changes mailing list