public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-physics/cernlib: ChangeLog cernlib-2006-r4.ebuild
@ 2011-07-21 16:08 Sebastien Fabbro (bicatali)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2011-07-21 16:08 UTC (permalink / raw
  To: gentoo-commits

bicatali    11/07/21 16:08:14

  Modified:             ChangeLog
  Added:                cernlib-2006-r4.ebuild
  Log:
  New debian patch set. Added static-libs flag. Switch to EAPI4
  
  (Portage version: 2.1.10.7/cvs/Linux x86_64)

Revision  Changes    Path
1.27                 sci-physics/cernlib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/ChangeLog?r1=1.26&r2=1.27

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	21 Jun 2011 14:40:05 -0000	1.26
+++ ChangeLog	21 Jul 2011 16:08:14 -0000	1.27
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.26 2011/06/21 14:40:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.27 2011/07/21 16:08:14 bicatali Exp $
+
+*cernlib-2006-r4 (21 Jul 2011)
+
+  21 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> +cernlib-2006-r4.ebuild:
+  New debian patch set. Added static-libs flag. Switch to EAPI4
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> cernlib-2006-r3.ebuild:
   Add dependency on virtual/fortran



1.1                  sci-physics/cernlib/cernlib-2006-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild?rev=1.1&content-type=text/plain

Index: cernlib-2006-r4.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild,v 1.1 2011/07/21 16:08:14 bicatali Exp $

EAPI=4
inherit eutils fortran-2 toolchain-funcs

DEB_PN=cernlib
DEB_PV=20061220+dfsg3
DEB_PR=1
DEB_P=${DEB_PN}_${DEB_PV}

DESCRIPTION="CERN program library for High Energy Physics"
HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/cernlib"
SRC_URI="mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.debian.tar.gz"

KEYWORDS="~amd64 ~hppa ~sparc ~x86"
LICENSE="GPL-2 LGPL-2 BSD"

SLOT="0"

RDEPEND=">=x11-libs/openmotif-2.3:0
	virtual/fortran
	virtual/lapack
	dev-lang/cfortran"

DEPEND="${RDEPEND}
	x11-misc/imake
	x11-misc/makedepend
	dev-util/pkgconfig"

IUSE="static-libs"

S="${WORKDIR}/${DEB_PN}-${DEB_PV}"

src_prepare() {
	mv ../debian .
	epatch "${FILESDIR}"/${P}-nogfortran.patch
	# set some default paths
	sed -i \
		-e "s:/usr/local:${EPREFIX}/usr:g" \
		-e "s:prefix)/lib:prefix)/$(get_libdir):" \
		-e "s:\$(prefix)/etc:${EPREFIX}/etc:" \
		-e 's:$(prefix)/man:$(prefix)/share/man:' \
		debian/add-ons/cernlib.mk || die "sed failed"

	# use system blas and lapack set by gentoo framework
	sed -i \
		-e "s:\$DEPS -lm:$(pkg-config --libs blas):" \
		-e "s:\$DEPS -llapack -lm:$(pkg-config --libs lapack):" \
		-e 's:`depend $d $a blas`::' \
		-e 's:X11R6:X11:g' \
		debian/add-ons/bin/cernlib.in || die "sed failed"

	cp debian/add-ons/Makefile .
	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"

	einfo "Applying Debian patches"
	emake -j1 patch

	epatch "${FILESDIR}"/${P}-fgets.patch
	# since we depend on cfortran, do not use the one from cernlib
	rm -f src/include/cfortran/cfortran.h

	# respect users flags
	sed -i \
		-e 's/-O3/-O2/g' \
		-e "s/-O2/${CFLAGS}/g" \
		-e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \
		-e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \
		-e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \
		src/config/linux.cf	\
		|| die "sed linux.cf failed"
	sed -i \
		-e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
		-e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
		src/config/{biglib,fortran,Imake}.rules \
		src/patchy/Imakefile \
		|| die "sed for ldflags propagation failed"

	# add missing headers for implicit
	sed -i \
		-e '0,/^#include/i#include <stdlib.h>' \
		src/kernlib/kerngen/ccgen*/*.c || die
}

src_compile() {
	# parallel make breaks and complex patched imake system, hard to debug
	emake -j1 cernlib-indep cernlib-arch
}

src_test() {
	LD_LIBRARY_PATH="${S}"/shlib emake -j1 cernlib-test
}

src_install() {
	emake DESTDIR="${D}" install
	use static-libs || rm -f "${ED}"usr/$(get_libdir)/lib*.a
	cd debian
	dodoc changelog README.* deadpool.txt NEWS copyright
	newdoc add-ons/README README.add-ons
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-physics/cernlib: ChangeLog cernlib-2006-r4.ebuild
@ 2011-07-21 16:47 Sebastien Fabbro (bicatali)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2011-07-21 16:47 UTC (permalink / raw
  To: gentoo-commits

bicatali    11/07/21 16:47:56

  Modified:             ChangeLog cernlib-2006-r4.ebuild
  Log:
  Removed static-libs flag, as they were built anyway
  
  (Portage version: 2.1.10.7/cvs/Linux x86_64)

Revision  Changes    Path
1.28                 sci-physics/cernlib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog	21 Jul 2011 16:08:14 -0000	1.27
+++ ChangeLog	21 Jul 2011 16:47:55 -0000	1.28
@@ -1,6 +1,9 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.27 2011/07/21 16:08:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.28 2011/07/21 16:47:55 bicatali Exp $
+
+  21 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> cernlib-2006-r4.ebuild:
+  Removed static-libs flag, as they were built anyway
 
 *cernlib-2006-r4 (21 Jul 2011)
 



1.2                  sci-physics/cernlib/cernlib-2006-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild?r1=1.1&r2=1.2

Index: cernlib-2006-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-2006-r4.ebuild	21 Jul 2011 16:08:14 -0000	1.1
+++ cernlib-2006-r4.ebuild	21 Jul 2011 16:47:55 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild,v 1.1 2011/07/21 16:08:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild,v 1.2 2011/07/21 16:47:55 bicatali Exp $
 
 EAPI=4
 inherit eutils fortran-2 toolchain-funcs
@@ -30,7 +30,7 @@
 	x11-misc/makedepend
 	dev-util/pkgconfig"
 
-IUSE="static-libs"
+IUSE=""
 
 S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
 
@@ -96,7 +96,6 @@
 
 src_install() {
 	emake DESTDIR="${D}" install
-	use static-libs || rm -f "${ED}"usr/$(get_libdir)/lib*.a
 	cd debian
 	dodoc changelog README.* deadpool.txt NEWS copyright
 	newdoc add-ons/README README.add-ons






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-07-21 16:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-21 16:47 [gentoo-commits] gentoo-x86 commit in sci-physics/cernlib: ChangeLog cernlib-2006-r4.ebuild Sebastien Fabbro (bicatali)
  -- strict thread matches above, loose matches on Subject: below --
2011-07-21 16:08 Sebastien Fabbro (bicatali)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox