Version bump. Removed older versions
authorSebastien Fabbro <bicatali@gentoo.org>
Wed, 12 Mar 2008 13:11:55 +0000 (13:11 +0000)
committerSebastien Fabbro <bicatali@gentoo.org>
Wed, 12 Mar 2008 13:11:55 +0000 (13:11 +0000)
Package-Manager: portage-2.1.4.4

sci-libs/blas-goto/ChangeLog
sci-libs/blas-goto/Manifest
sci-libs/blas-goto/blas-goto-1.19.ebuild [deleted file]
sci-libs/blas-goto/blas-goto-1.24.ebuild [moved from sci-libs/blas-goto/blas-goto-1.22.ebuild with 59% similarity]
sci-libs/blas-goto/files/blas-goto-1.24-sharedlibs.patch [new file with mode: 0644]

index d778c87fc8a4c77c8de850751e02104e023b9df0..1b855d2340576561b878e519a842a46eac91f637 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/blas-goto
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/ChangeLog,v 1.15 2008/02/12 17:56:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/ChangeLog,v 1.16 2008/03/12 13:11:54 bicatali Exp $
+
+*blas-goto-1.24 (12 Mar 2008)
+
+  12 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/blas-goto-1.24-sharedlibs.patch, -blas-goto-1.19.ebuild,
+  -blas-goto-1.22.ebuild, +blas-goto-1.24.ebuild:
+  Version bump. Removed older versions
 
 *blas-goto-1.22-r1 (12 Feb 2008)
 
index 0115c7e2f11120fd0b03d275cb900b6d795de430..b46f474bd78fa0dd672403ddd4a2029e34427bf5 100644 (file)
@@ -2,19 +2,19 @@
 Hash: SHA1
 
 AUX blas-goto-1.22-sharedlibs.patch 1230 RMD160 aa335dec7c1e7e5eac936f039eb13d5b61592160 SHA1 9d9f9101a0b1e88cdd6dcb710c9469296b8f31c3 SHA256 920a27a4ff09fbbcf9d9574867d533bd3fc651cf0e65e6ffebcbe4f59816908f
+AUX blas-goto-1.24-sharedlibs.patch 581 RMD160 a7b099220f898c42ee9fbde63e94dd01b828956b SHA1 9d65206147ace73e7e50e7867417ce065dd842af SHA256 ccb026f7adebf05ea623bb33cdac1ef4cc5261e95f516ee49531e2ce90f5dabf
 AUX blas.pc.in 292 RMD160 b5ddc452918fb54851cfe24447e1c10d67586943 SHA1 8586cdea51a3094e92871c16ec97e2cfbdc75320 SHA256 aa28cff8ba3f30fdf56e2619eff0655f5b43a062cfe03c1d51e8b4716b1a1e6d
 AUX eselect.blas.goto 193 RMD160 b25ff1d0b37fed194afde473019706e6a9404718 SHA1 e4c78e7cace1d7144f1fc921a29d516b4234703d SHA256 33a9d0be6f400f792f744604afae7239b2d7392cc0e8cac758b53e695acc0802
-DIST GotoBLAS-1.19.tar.gz 1935724 RMD160 ef3ac23815802ddd622a41e79dc473efad2663aa SHA1 2bbd8ac24d441d1b7ed91ea8bbd84d23c8cc131f SHA256 68961f6e81d91c81898fa0b89c8632fc5d4f4fe60f8d0019e90b1a45d3486bdb
 DIST GotoBLAS-1.22.tar.gz 2055354 RMD160 2eec2605a10e3e6fff1d3db2be21d774f5c0e804 SHA1 4f170dbb0b4ef337ed78efd78d7c5a1dad4bd8c4 SHA256 a5479c4f2e78d3116536675a83df5d2dc23648f90a69babb646b69d02f695d6c
-EBUILD blas-goto-1.19.ebuild 4382 RMD160 c251d9a4dbc01d23691d52aec866f6da5842d1d0 SHA1 c6a63909dbf98091e1dc3544a3b836cae1b107ff SHA256 656cc13e1b0a224960318c9441ad46b71b008ba62f7920775043c3a1dd094160
+DIST GotoBLAS-1.24.tar.gz 2133341 RMD160 6fbbffe465a31598814b618ac5459abc896abff0 SHA1 319c30d19b1ea650aff46d50c647462b2af19d07 SHA256 74f12ca584669acb971bf36725c4179fc723d1425b7558c87feab9f47ea47c18
 EBUILD blas-goto-1.22-r1.ebuild 4186 RMD160 ed7afb15966d0ae8a952036af3049ea7ba08ab9a SHA1 81d9bd056d3adbf45966f3e4347e4318af112f57 SHA256 b33d4f2f669b44ae7fe71a32765c7405fb25d85116f911ac6ed6f0efe78d5fa5
-EBUILD blas-goto-1.22.ebuild 4375 RMD160 df88b4a1ec66e59ee50a8ca8eb70e47351da3992 SHA1 0279feaff01cf4668dd8576aa3bb849818f55d43 SHA256 34ee78d33fafb2b86a1eed067db1fa5159731511281631c499e8d8dceb8b6792
-MISC ChangeLog 3235 RMD160 7b52c1bb48d96771559be799bc8be6c94c1534a6 SHA1 e76cd8881be9d800d21427c2a3a9193bd41fb08b SHA256 02dbfdf601eb866664e63773ce1812b5edad21b513fafdda436b3a01ba14d5c1
+EBUILD blas-goto-1.24.ebuild 4183 RMD160 e51ad0d15cdd8e59d7eb6eadebc55ea39fd8fa22 SHA1 b37cf3c45e700346c3f6ff047954866ed1b007b2 SHA256 7892150bbb1a19af023676d1161ec6580dd04d293e5f6287f8fdb32de5eb4746
+MISC ChangeLog 3477 RMD160 85240c05df30148f65574612e3a579b6cd2cdf0e SHA1 3ff3a7f5e36f3318e88b22e67e801ddc547fe2c3 SHA256 981f2bb91e46f32920bc49cab35a480a23b01deac55eaef8c2a1d5938fd1d287
 MISC metadata.xml 626 RMD160 d5c6d5bdb892da05af395f2baf4c4bda6c7341a8 SHA1 99d491e9a98cde53bc8d18ef73d52e26d704134f SHA256 9355c5714a5f6ee94704a3785547b40a69aa62bd57195e804c0ab126dee735f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHsd3b1ycZbhPLE2ARAt4cAJ9vwxovp+nCgwY1nDzwOaKzsAgn8QCeObWN
-H4ONCjfiSWaG5DgVb51q0Ig=
-=+0Vy
+iD8DBQFH19am1ycZbhPLE2ARAvvmAKCJXRx0ovzHBWUjc/IP0kDO2/HiaQCffcLV
+cLoOmG8R/tKgUbebiz0GJu0=
+=JUFz
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/blas-goto/blas-goto-1.19.ebuild b/sci-libs/blas-goto/blas-goto-1.19.ebuild
deleted file mode 100644 (file)
index 0cf2afb..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/blas-goto-1.19.ebuild,v 1.4 2007/10/11 17:38:06 bicatali Exp $
-
-inherit eutils fortran flag-o-matic toolchain-funcs
-
-MY_PN="GotoBLAS"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="The fastest implementations of the Basic Linear Algebra Subroutines"
-HOMEPAGE="http://www.tacc.utexas.edu/resources/software/software.php"
-SRC_URI="http://www.tacc.utexas.edu/resources/software/login/gotoblas/${MY_P}.tar.gz"
-LICENSE="tacc"
-SLOT="0"
-# See http://www.tacc.utexas.edu/resources/software/gotoblasfaq.php
-# for supported architectures
-KEYWORDS="~x86 ~amd64"
-IUSE="threads doc"
-RESTRICT="mirror"
-RDEPEND="app-admin/eselect-blas
-       dev-util/pkgconfig
-       doc? ( app-doc/blas-docs )"
-
-DEPEND="app-admin/eselect-blas
-       >=sys-devel/binutils-2.17"
-
-S="${WORKDIR}/${MY_PN}"
-FORTRAN="g77 gfortran ifc"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       # Set up C compiler
-       if [[ $(tc-getCC) = *gcc ]]; then
-               C_COMPILER="GNU"
-       elif [[ $(tc-getCC) = icc ]]; then
-               C_COMPILER="INTEL"
-       else
-               die "tc-getCC() returned an invalid C compiler; valid are gcc or icc."
-       fi
-
-       # Set up FORTRAN 77 compiler
-       case ${FORTRANC} in
-               g77)
-                       F_COMPILER="G77"
-                       ;;
-               gfortran)
-                       F_COMPILER="GFORTRAN"
-                       F_LIB="-lgfortran"
-                       ;;
-               ifc|ifort)
-                       F_COMPILER="INTEL"
-                       ;;
-               *)
-               die "fortran.eclass returned an invalid Fortran compiler \'${FORTRANC}\'; valid are ${FORTRAN}."
-       esac
-
-       # Fix shared lib build
-       sed -i \
-               -e "s:\(&& echo OK\):${F_LIB} \1:g" \
-               "${S}"/exports/Makefile \
-               || die "sed for shared libs failed"
-
-       # Set up compilers
-       sed -i \
-               -e "s:^# \(C_COMPILER =\) GNU:\1 ${C_COMPILER}:g" \
-               -e "s:^# \(F_COMPILER =\) G77:\1 ${F_COMPILER}:g" \
-               -e "s:^# \(SMP = 1\):\1:g" \
-               -e "s:\$(COMPILER_PREFIX)ar:$(tc-getAR):" \
-               -e "s:\$(COMPILER_PREFIX)as:$(tc-getAS):" \
-               -e "s:\$(COMPILER_PREFIX)ld:$(tc-getLD):" \
-               -e "s:\$(COMPILER_PREFIX)ranlib:$(tc-getRANLIB):" \
-               "${S}"/Makefile.rule \
-               || die "sed for setting up compilers failed"
-
-       # Threaded?
-       if use threads; then
-               sed -i \
-                       -e "s:^# \(SMP = 1\):\1:g" \
-                       "${S}"/Makefile.rule \
-                       || die "sed for threads failed"
-       fi
-
-       # If you need a 64-bit integer interface, also do this for "INTERFACE64 = 1"
-       if use amd64; then
-               sed -i \
-                       -e "s:^# \(BINARY64  = 1\):\1:g" \
-                       "${S}"/Makefile.rule \
-                       || die "sed for 64 binary failed"
-       fi
-
-       # Respect CFLAGS/FFLAGS
-       if [[ -z "${FFLAGS}" ]]; then
-               ewarn "FORTRAN FFLAGS undefined, using -O2"
-               export FFLAGS="-O2"
-       fi
-
-       sed -i \
-               -e '/^CFLAGS/s:=:+=:' \
-               -e '/^FFLAGS/s:=:+=:' \
-               "${S}"/Makefile.rule \
-               || die "sed for flags failed"
-}
-
-src_compile() {
-
-       # Make static library
-       emake LDFLAGS="$(raw-ldflags)" || die "emake failed"
-
-       # Make shared library
-       cd exports
-       emake so -j1 || die "emake failed"
-}
-
-src_test() {
-       cd test
-       emake || die "emake test failed"
-       make clean
-}
-
-src_install() {
-       local MAIN_DIR="/usr/$(get_libdir)/blas"
-       local DIR="${MAIN_DIR}/goto"
-
-       # dolib.so doesn't support our alternate locations
-       exeinto ${DIR}
-       doexe libgoto_*.so
-       dosym libgoto_*.so ${DIR}/libgoto.so
-       dosym libgoto_*.so ${DIR}/libgoto.so.0
-       dosym libgoto_*.so ${DIR}/libgoto.so.0.0.0
-
-       # dolib.a doesn't support our alternate locations
-       insinto ${DIR}
-       doins libgoto_*.a
-       dosym libgoto_*.a ${DIR}/libgoto.a
-
-       dodoc 01Readme.txt 03History.txt 04FAQ.txt
-
-       cp "${FILESDIR}"/blas.pc.in blas.pc
-       local extlibs=""
-       use threads && extlibs="${extlibs} -lpthread"
-       extlibs="${extlibs}"
-       sed -i \
-               -e "s/@LIBDIR@/$(get_libdir)/" \
-               -e "s/@PV@/${PV}/" \
-               -e "s/@EXTLIBS@/${extlibs}/" \
-               blas.pc || die "sed blas.pc failed"
-       insinto /usr/$(get_libdir)/blas/goto
-       doins blas.pc
-       ESELECT_PROF=goto
-       eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.goto ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-       local p=blas
-       local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-       if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-               # work around eselect bug #189942
-               local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
-               [[ -e ${configfile} ]] && rm -f ${configfile}
-               eselect ${p} set ${ESELECT_PROF}
-               elog "${p} has been eselected to ${ESELECT_PROF}"
-       else
-               elog "Current eselected ${p} is ${current_lib}"
-               elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-               elog "\t eselect ${p} set ${ESELECT_PROF}"
-       fi
-}
similarity index 59%
rename from sci-libs/blas-goto/blas-goto-1.22.ebuild
rename to sci-libs/blas-goto/blas-goto-1.24.ebuild
index cf7cc2e90268d7e36481962d58d69f3076d28112..cb5e61b49a345237d5de66fd4f7d50d51a34cf35 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/blas-goto-1.22.ebuild,v 1.1 2008/01/24 10:24:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/blas-goto-1.24.ebuild,v 1.1 2008/03/12 13:11:54 bicatali Exp $
 
 inherit eutils fortran flag-o-matic toolchain-funcs
 
@@ -14,7 +14,7 @@ SLOT="0"
 # See http://www.tacc.utexas.edu/resources/software/gotoblasfaq.php
 # for supported architectures
 KEYWORDS="~x86 ~amd64"
-IUSE="threads doc"
+IUSE="int64 threads doc"
 RESTRICT="mirror"
 RDEPEND="app-admin/eselect-blas
        dev-util/pkgconfig
@@ -24,82 +24,66 @@ DEPEND="app-admin/eselect-blas
        >=sys-devel/binutils-2.17"
 
 S="${WORKDIR}/${MY_PN}"
-FORTRAN="g77 gfortran ifc"
+FORTRAN="gfortran g77 ifc"
+
+ESELECT_PROF=goto
 
 src_unpack() {
        unpack ${A}
        cd "${S}"
 
-       # Set up C compiler
-       if [[ $(tc-getCC) = *gcc ]]; then
-               C_COMPILER="GNU"
-       elif [[ $(tc-getCC) = icc ]]; then
-               C_COMPILER="INTEL"
-       else
-               die "tc-getCC() returned an invalid C compiler; valid are gcc or icc."
+       # patch to link with m and fortran libs, works with asneeded
+       epatch "${FILESDIR}"/${P}-sharedlibs.patch
+
+       # Set up C compiler: forcing gcc for now
+       if [[ $(tc-getCC) != *gcc ]]; then
+               ewarn "Your C compiler is set to $(tc-getCC)"
+               ewarn "${PN} needs gcc to inline assembler, others compilers have reported failures"
+               ewarn "Forcing gcc"
        fi
+       C_COMPILER=GNU
 
        # Set up FORTRAN 77 compiler
        case ${FORTRANC} in
-               g77)
-                       F_COMPILER="G77"
-                       ;;
-               gfortran)
-                       F_COMPILER="GFORTRAN"
-                       F_LIB="-lgfortran"
-                       ;;
-               ifc|ifort)
-                       F_COMPILER="INTEL"
-                       ;;
+               g77) F_COMPILER=G77;;
+               gfortran) F_COMPILER=GFORTRAN;;
+               ifc|ifort) F_COMPILER=INTEL;;
                *)
-               die "fortran.eclass returned an invalid Fortran compiler \'${FORTRANC}\'; valid are ${FORTRAN}."
+                       die "Invalid Fortran compiler: ${FORTRANC}; valid are ${FORTRAN}."
        esac
 
-       # Fix shared lib build
-       sed -i \
-               -e "s:\(&& echo OK\):${F_LIB} \1:g" \
-               "${S}"/exports/Makefile \
-               || die "sed for shared libs failed"
-
        # Set up compilers
        sed -i \
                -e "s:^# \(C_COMPILER =\) GNU:\1 ${C_COMPILER}:g" \
                -e "s:^# \(F_COMPILER =\) G77:\1 ${F_COMPILER}:g" \
-               -e "s:^# \(SMP = 1\):\1:g" \
-               -e "s:\$(COMPILER_PREFIX)ar:$(tc-getAR):" \
-               -e "s:\$(COMPILER_PREFIX)as:$(tc-getAS):" \
-               -e "s:\$(COMPILER_PREFIX)ld:$(tc-getLD):" \
-               -e "s:\$(COMPILER_PREFIX)ranlib:$(tc-getRANLIB):" \
-               "${S}"/Makefile.rule \
-               || die "sed for setting up compilers failed"
-
-       # Threaded?
+               -e "s:\$(CROSS_BINUTILS)ar:$(tc-getAR):" \
+               -e "s:\$(CROSS_BINUTILS)as:$(tc-getAS):" \
+               -e "s:\$(CROSS_BINUTILS)ld:$(tc-getLD):" \
+               -e "s:\$(CROSS_BINUTILS)ranlib:$(tc-getRANLIB):" \
+               Makefile.rule \
+               || die "sed for toolchain failed"
+
        if use threads; then
                sed -i \
                        -e "s:^# \(SMP = 1\):\1:g" \
-                       "${S}"/Makefile.rule \
+                       Makefile.rule \
                        || die "sed for threads failed"
        fi
 
-       # If you need a 64-bit integer interface, also do this for "INTERFACE64 = 1"
        if use amd64; then
                sed -i \
                        -e "s:^# \(BINARY64  = 1\):\1:g" \
-                       "${S}"/Makefile.rule \
+                       Makefile.rule \
                        || die "sed for 64 binary failed"
        fi
 
-       # Respect CFLAGS/FFLAGS
-       if [[ -z "${FFLAGS}" ]]; then
-               ewarn "FORTRAN FFLAGS undefined, using -O2"
-               export FFLAGS="-O2"
+       if use int64; then
+               sed -i \
+                       -e "s:^# \(INTERFACE64  = 1\):\1:g" \
+                       Makefile.rule \
+                       || die "sed for 64 integers failed"
+               ESELECT_PROF="${ESELECT_PROF}-int64"
        fi
-
-       sed -i \
-               -e '/^CFLAGS/s:=:+=:' \
-               -e '/^FFLAGS/s:=:+=:' \
-               "${S}"/Makefile.rule \
-               || die "sed for flags failed"
 }
 
 src_compile() {
@@ -119,27 +103,26 @@ src_test() {
 }
 
 src_install() {
-       local MAIN_DIR="/usr/$(get_libdir)/blas"
-       local DIR="${MAIN_DIR}/goto"
+       local install_dir=/usr/$(get_libdir)/blas/goto
+       dodir ${install_dir}
 
        # dolib.so doesn't support our alternate locations
-       exeinto ${DIR}
-       doexe libgoto_*.so
-       dosym libgoto_*.so ${DIR}/libgoto.so
-       dosym libgoto_*.so ${DIR}/libgoto.so.0
-       dosym libgoto_*.so ${DIR}/libgoto.so.0.0.0
+       exeinto ${install_dir}
+       doexe libgoto_*.so || die "installing shared lib failed"
+       dosym libgoto_*.so ${install_dir}/libgoto.so
+       dosym libgoto_*.so ${install_dir}/libgoto.so.0
+       dosym libgoto_*.so ${install_dir}/libgoto.so.0.0.0
 
        # dolib.a doesn't support our alternate locations
-       insinto ${DIR}
-       doins libgoto_*.a
-       dosym libgoto_*.a ${DIR}/libgoto.a
+       insinto ${install_dir}
+       doins libgoto_*.a || die "installing static lib failed"
+       dosym libgoto_*.a ${install_dir}/libgoto.a
 
-       dodoc 01Readme.txt 03History.txt 04FAQ.txt
+       dodoc 01Readme.txt 03History.txt 04FAQ.txt || die
 
        cp "${FILESDIR}"/blas.pc.in blas.pc
        local extlibs=""
        use threads && extlibs="${extlibs} -lpthread"
-       extlibs="${extlibs}"
        sed -i \
                -e "s/@LIBDIR@/$(get_libdir)/" \
                -e "s/@PV@/${PV}/" \
@@ -147,7 +130,6 @@ src_install() {
                blas.pc || die "sed blas.pc failed"
        insinto /usr/$(get_libdir)/blas/goto
        doins blas.pc
-       ESELECT_PROF=goto
        eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.goto ${ESELECT_PROF}
 }
 
diff --git a/sci-libs/blas-goto/files/blas-goto-1.24-sharedlibs.patch b/sci-libs/blas-goto/files/blas-goto-1.24-sharedlibs.patch
new file mode 100644 (file)
index 0000000..1180c4f
--- /dev/null
@@ -0,0 +1,18 @@
+--- exports/Makefile.orig      2008-03-12 12:16:22.966541966 +0000
++++ exports/Makefile   2008-03-12 12:24:08.850292012 +0000
+@@ -104,13 +104,13 @@
+ ../$(LIBSONAME) : ../$(LIBNAME) linux.def
+       $(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
+       -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
+-      -Wl,--retain-symbols-file=linux.def $(PTHREADLIB)
++      -Wl,--retain-symbols-file=linux.def $(PTHREADLIB) -lm
+ 
+ endif
+ 
+ ifeq ($(OSNAME), FreeBSD)
+ 
+-so : ../$(LIBSONAME) test
++so : ../$(LIBSONAME)
+ 
+ ../$(LIBSONAME) : ../$(LIBNAME) linux.def
+       $(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \