Fixes for the blas-atlas-3.8.0 ebuild. Should apply to 3.8.1 as well.

blas-atlas-3.8.0.ebuild.patch (text/plain), 2.36 KB, created by Johan Hattne on 2008-02-28 11:08:54 UTC

Index: blas-atlas-3.8.0.ebuild
===================================================================
--- blas-atlas-3.8.0.ebuild	(revision 18545)
+++ blas-atlas-3.8.0.ebuild	(working copy)
@@ -65,8 +65,10 @@
 	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
 	epatch "${FILESDIR}"/${MY_PN}-${PATCH_V}-decl-fix.patch
 
-	[[ ${CHOST} == *-darwin* ]] && \
+	if [[ ${CHOST} == *-darwin* ]]; then
 		sed -e /LIBTOOL/s/libtool/glibtool/ -i CONFIG/src/SpewMakeInc.c
+		epatch "${FILESDIR}"/${MY_PN}-3.8.0-make-top.patch
+	fi
 
 	# fix for pentium M
 	sed -e "s|iret = IntPM;|iret = IntPM;  break;|g" \
@@ -106,16 +108,16 @@
 	# atlas does its own parallel builds
 	emake -j1 || die "emake failed"
 
-	RPATH="${DESTTREE}"/$(get_libdir)/blas
+	RPATH="${EPREFIX}/${DESTTREE}"/$(get_libdir)/blas
 	make \
-		LIBDIR=$(get_libdir) \
+		LIBDIR="${EPREFIX}/${DESTTREE}"/$(get_libdir) \
 		RPATH="${RPATH}"/atlas \
 		shared || die "failed to build shared libraries"
 
 	# build shared libraries of threaded libraries if applicable
 	if [[ -d gentoo/libptcblas.a ]]; then
 		make \
-			LIBDIR=$(get_libdir) \
+			LIBDIR="${EPREFIX}/${DESTTREE}"/$(get_libdir) \
 			RPATH="${RPATH}"/threaded-atlas \
 			ptshared || die "failed to build threaded shared libraries"
 	fi
@@ -138,7 +140,8 @@
 }
 
 src_install () {
-	dodir "${RPATH}"/atlas
+	dodir "${DESTTREE}/"$(get_libdir)
+	dodir "${DESTTREE}/"$(get_libdir)"/blas/atlas"
 	cd "${BLD_DIR}"/gentoo/libs
 	cp -P libatlas* "${ED}/${DESTTREE}"/$(get_libdir) \
 		|| die "Failed to install libatlas"
@@ -157,7 +160,7 @@
 		-e "s:@THREADLIBS@:${threadlibs}:g" \
 		*blas.pc || die "sed *blas.pc failed"
 
-	cp -P *blas* "${ED}/${RPATH}"/atlas \
+	cp -P *blas* "${ED}/${DESTTREE}/"$(get_libdir)"/blas/atlas" \
 		|| die "Failed to install blas/cblas"
 
 	ESELECT_PROF=atlas
@@ -165,7 +168,7 @@
 	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.atlas ${ESELECT_PROF}
 
 	if [[ -d "${BLD_DIR}"/gentoo/threaded-libs ]];	then
-		dodir "${RPATH}"/threaded-atlas
+		dodir "${DESTTREE}/"$(get_libdir)"/blas/threaded-atlas"
 		cd "${BLD_DIR}"/gentoo/threaded-libs
 
 		# pkgconfig files
@@ -179,7 +182,7 @@
 			-e "s:@THREADLIBS@:${threadlibs}:g" \
 			*blas.pc || die "sed *blas.pc failed"
 
-		cp -P * "${ED}/${RPATH}"/threaded-atlas \
+		cp -P * "${ED}/${DESTTREE}/"$(get_libdir)"/blas/threaded-atlas" \
 			|| die "Failed to install threaded atlas"
 		ESELECT_PROF=atlas-threads