* [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/, sci-libs/calculix-ccx/files/
@ 2014-09-05 15:24 Jauhien Piatlicki
0 siblings, 0 replies; 3+ messages in thread
From: Jauhien Piatlicki @ 2014-09-05 15:24 UTC (permalink / raw
To: gentoo-commits
commit: 7a9434d91f7e57436965c2f3510c45ced31a9e08
Author: Rongcui Dong <carldong76 <AT> gmail <DOT> com>
AuthorDate: Fri Sep 5 12:42:52 2014 +0000
Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Fri Sep 5 12:42:52 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7a9434d9
Version Bump
Package-Manager: portage-2.3.6-r9
---
sci-libs/calculix-ccx/ChangeLog | 11 ++++++--
...ulix-ccx-2.2.ebuild => calculix-ccx-2.7.ebuild} | 19 ++++++-------
.../calculix-ccx/files/01_ccx_2.2_Makefile.patch | 23 ----------------
.../calculix-ccx/files/01_ccx_2.2_lapack.patch | 21 ---------------
...7_Makefile_custom_cc_flags_spooles_arpack.patch | 31 ++++++++++++++++++++++
.../calculix-ccx/files/01_ccx_2.7_lapack.patch | 11 ++++++++
6 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/sci-libs/calculix-ccx/ChangeLog b/sci-libs/calculix-ccx/ChangeLog
index bf56c0d..96ad8ad 100644
--- a/sci-libs/calculix-ccx/ChangeLog
+++ b/sci-libs/calculix-ccx/ChangeLog
@@ -1,7 +1,15 @@
# ChangeLog for sci-libs/calculix-ccx
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*calculix-ccx-2.7 (05 Sep 2014)
+
+ 05 Sep 2014; Rongcui Dong <carldong76@gmail.com> +calculix-ccx-2.7.ebuild,
+ +files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch,
+ +files/01_ccx_2.7_lapack.patch, -calculix-ccx-2.2.ebuild,
+ -files/01_ccx_2.2_Makefile.patch, -files/01_ccx_2.2_lapack.patch:
+ Version Bump
+
22 Feb 2013; Justin Lecher <jlec@gentoo.org> calculix-ccx-2.2.ebuild,
metadata.xml:
Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
@@ -39,4 +47,3 @@
+files/01_ccx_1.8_Makefile.patch, +files/01_ccx_1.8_lapack.patch,
+calculix-ccx-1.8.ebuild, +metadata.xml:
Reworked ebuild for bug 125773, thanks to pva
-
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.7.ebuild
similarity index 74%
rename from sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild
rename to sci-libs/calculix-ccx/calculix-ccx-2.7.ebuild
index ecfb386..5ed4d92 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.7.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
MY_P=ccx_${PV}
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="arpack doc examples lapack threads"
+IUSE="arpack doc examples lapack"
RDEPEND="
arpack? ( sci-libs/arpack )
@@ -32,7 +32,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/CalculiX/${MY_P}/src
src_prepare() {
- epatch "${FILESDIR}"/01_${MY_P}_Makefile.patch
+ #epatch "${FILESDIR}"/01_${MY_P}_Makefile_spooles_arpack.patch
+ epatch "${FILESDIR}"/01_${MY_P}_Makefile_custom_cc_flags_spooles_arpack.patch
use lapack && epatch "${FILESDIR}"/01_${MY_P}_lapack.patch
}
@@ -41,17 +42,17 @@ src_configure() {
export BLAS=$($(tc-getPKG_CONFIG) --libs blas)
- export SPOOLESINC="-I/usr/include/spooles -DSPOOLES"
- export SPOOLESLIB="-lspooles"
- if use threads; then
- export USE_MT="-DUSE_MT"
- export SPOOLESLIB="-lspooles -lpthread"
- fi
+ #export SPOOLESINC="-I/usr/include/spooles -DSPOOLES"
+ append-cflags "-I/usr/include/spooles -DSPOOLES"
+ #export SPOOLESLIB="-lspooles -lpthread"
+ export USE_MT="-DUSE_MT"
if use arpack; then
export ARPACK="-DARPACK"
export ARPACKLIB=$($(tc-getPKG_CONFIG) --libs arpack)
fi
+ export CC="$(tc-getCC)"
+ export FC="$(tc-getFC)"
}
src_install () {
diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.2_Makefile.patch b/sci-libs/calculix-ccx/files/01_ccx_2.2_Makefile.patch
deleted file mode 100644
index e759dda..0000000
--- a/sci-libs/calculix-ccx/files/01_ccx_2.2_Makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- CalculiX/ccx_2.1/src/Makefile.orig 2009-08-28 09:53:59.000000000 +0200
-+++ CalculiX/ccx_2.1/src/Makefile 2009-08-28 09:59:58.000000000 +0200
-@@ -1,5 +1,5 @@
-
--CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
-+CFLAGS = -Wall -O3 $(SPOOLESINC) -DARCH="Linux" -DMATRIXSTORAGE $(ARPACK) $(USE_MT)
- FFLAGS = -Wall -O3 -fopenmp
-
- CC=cc
-@@ -18,12 +18,7 @@
- OCCXC = $(SCCXC:.c=.o)
- OCCXMAIN = $(SCCXMAIN:.c=.o)
-
--DIR=../../../SPOOLES.2.2
--
--LIBS = \
-- $(DIR)/spooles.a \
-- ../../../ARPACK/libarpack_INTEL.a \
-- -lm -lc
-+LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) -lm -lc
-
- ccx_2.2: $(OCCXMAIN) ccx_2.2.a $(LIBS)
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.2.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.2.a -lpthread $(LIBS)
diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.2_lapack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.2_lapack.patch
deleted file mode 100644
index f7bd035..0000000
--- a/sci-libs/calculix-ccx/files/01_ccx_2.2_lapack.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- CalculiX/ccx_2.1/src/Makefile.std 2009-08-28 09:59:31.000000000 +0200
-+++ CalculiX/ccx_2.1/src/Makefile 2009-08-28 09:59:58.000000000 +0200
-@@ -18,7 +18,7 @@
- OCCXC = $(SCCXC:.c=.o)
- OCCXMAIN = $(SCCXMAIN:.c=.o)
-
--LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) -lm -lc
-+LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) $(LAPACK) -lm -lc
-
- ccx_2.0: $(OCCXMAIN) ccx_2.0.a $(LIBS)
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.0.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.0.a -lpthread $(LIBS)
---- CalculiX/ccx_2.1/src/Makefile.inc.orig 2009-08-28 10:00:06.000000000 +0200
-+++ CalculiX/ccx_2.1/src/Makefile.inc 2009-08-28 10:00:33.000000000 +0200
-@@ -91,7 +91,6 @@
- deuldlag.f \
- dflux.f \
- dfluxes.f \
--dgesv.f \
- diamtr.f \
- distattach.f \
- distributedcouplings.f \
diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch
new file mode 100644
index 0000000..db3b301
--- /dev/null
+++ b/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch
@@ -0,0 +1,31 @@
+diff -rupN CalculiX/ccx_2.7/src/Makefile CalculiX.patched/ccx_2.7/src/Makefile
+--- CalculiX/ccx_2.7/src/Makefile 2014-03-02 09:33:28.000000000 -0500
++++ CalculiX.patched/ccx_2.7/src/Makefile 2014-09-04 16:49:28.456612880 -0400
+@@ -1,9 +1,8 @@
++CFLAGS := -Wall -O3 -DARCH="Linux" -DMATRIXSTORAGE $(CFLAGS)
++FFLAGS := -Wall -O3 $(FFLAGS)
+
+-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
+-FFLAGS = -Wall -O3
+-
+-CC=cc
+-FC=gfortran
++#CC:=cc
++#FC:=gfortran
+
+ .c.o :
+ $(CC) $(CFLAGS) -c $<
+@@ -18,12 +17,7 @@ OCCXF = $(SCCXF:.f=.o)
+ OCCXC = $(SCCXC:.c=.o)
+ OCCXMAIN = $(SCCXMAIN:.c=.o)
+
+-DIR=../../../SPOOLES.2.2
+-
+-LIBS = \
+- $(DIR)/spooles.a \
+- ../../../ARPACK/libarpack_INTEL.a \
+- -lpthread -lm -lc
++LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) -lm -lc -lpthread -lspooles
+
+ ccx_2.7: $(OCCXMAIN) ccx_2.7.a $(LIBS)
+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.7.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.7.a $(LIBS)
diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch
new file mode 100644
index 0000000..cc83fca
--- /dev/null
+++ b/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch
@@ -0,0 +1,11 @@
+diff -rupN CalculiX/ccx_2.7/src/Makefile.inc CalculiX.patch/ccx_2.7/src/Makefile.inc
+--- CalculiX/ccx_2.7/src/Makefile.inc 2014-03-02 09:33:27.000000000 -0500
++++ CalculiX.patch/ccx_2.7/src/Makefile.inc 2014-08-30 11:18:14.914823360 -0400
+@@ -128,7 +128,6 @@ depvars.f \
+ deuldlag.f \
+ dflux.f \
+ dfluxs.f \
+-dgesv.f \
+ distattach.f \
+ distattach_3d.f \
+ distattachline.f \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/, sci-libs/calculix-ccx/files/
@ 2014-09-08 10:07 Francois Bissey
0 siblings, 0 replies; 3+ messages in thread
From: Francois Bissey @ 2014-09-08 10:07 UTC (permalink / raw
To: gentoo-commits
commit: dbbb91e76fa7c58458dd7e3e20827e2337f6bd26
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Mon Sep 8 10:06:52 2014 +0000
Commit: Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Mon Sep 8 10:06:52 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dbbb91e7
Fixing issue #264 and giving it a serious look over and clean. Enabled threading. More could be done.
Package-Manager: portage-2.2.10
---
sci-libs/calculix-ccx/ChangeLog | 6 +++++
sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild | 26 ++++++++++------------
...7_Makefile_custom_cc_flags_spooles_arpack.patch | 2 +-
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/sci-libs/calculix-ccx/ChangeLog b/sci-libs/calculix-ccx/ChangeLog
index 7eccdea..9e1b1f5 100644
--- a/sci-libs/calculix-ccx/ChangeLog
+++ b/sci-libs/calculix-ccx/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Sep 2014; François Bissey <francois.bissey@canterbury.ac.nz>
+ calculix-ccx-2.7-r1.ebuild,
+ files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch:
+ Fixing issue #264 and giving it a serious look over and clean. Enabled
+ threading. More could be done.
+
*calculix-ccx-2.7-r1 (07 Sep 2014)
07 Sep 2014; Rongcui Dong <carldong76@gmail.com> +calculix-ccx-2.7-r1.ebuild,
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
index 2394647..a511dc9 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
@@ -18,12 +18,12 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="arpack doc examples lapack"
+IUSE="arpack doc examples threads"
RDEPEND="
- arpack? ( sci-libs/arpack )
- lapack? ( virtual/lapack )
- >=sci-libs/spooles-2.2
+ arpack? ( >=sci-libs/arpack-3.1.3 )
+ >=sci-libs/spooles-2.2[threads=]
+ virtual/lapack
virtual/blas"
DEPEND="${RDEPEND}
virtual/pkgconfig
@@ -32,25 +32,23 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/CalculiX/${MY_P}/src
src_prepare() {
- #epatch "${FILESDIR}"/01_${MY_P}_Makefile_spooles_arpack.patch
epatch "${FILESDIR}"/01_${MY_P}_Makefile_custom_cc_flags_spooles_arpack.patch
- use lapack && epatch "${FILESDIR}"/01_${MY_P}_lapack.patch
+ epatch "${FILESDIR}"/01_${MY_P}_lapack.patch
}
src_configure() {
- use lapack && export LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
+ # Technically we currently only need this when arpack is not used.
+ # Keeping things this way in case we change pkgconfig for arpack
+ export LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
- export BLAS=$($(tc-getPKG_CONFIG) --libs blas)
-
- #export SPOOLESINC="-I/usr/include/spooles -DSPOOLES"
append-cflags "-I/usr/include/spooles -DSPOOLES"
- #export SPOOLESLIB="-lspooles -lpthread"
- export USE_MT="-DUSE_MT"
+ if use threads; then
+ append-cflags "-DUSE_MT"
+ fi
if use arpack; then
- export ARPACK="-DARPACK"
export ARPACKLIB=$($(tc-getPKG_CONFIG) --libs arpack)
- append-cflags "${ARPACK}"
+ append-cflags "-DARPACK"
fi
export CC="$(tc-getCC)"
export FC="$(tc-getFC)"
diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch
index db3b301..b042634 100644
--- a/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch
+++ b/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch
@@ -25,7 +25,7 @@ diff -rupN CalculiX/ccx_2.7/src/Makefile CalculiX.patched/ccx_2.7/src/Makefile
- $(DIR)/spooles.a \
- ../../../ARPACK/libarpack_INTEL.a \
- -lpthread -lm -lc
-+LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) -lm -lc -lpthread -lspooles
++LIBS = $(ARPACKLIB) $(LAPACK) -lm -lc -lspooles -lpthread
ccx_2.7: $(OCCXMAIN) ccx_2.7.a $(LIBS)
./date.pl; $(CC) $(CFLAGS) -c ccx_2.7.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.7.a $(LIBS)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/, sci-libs/calculix-ccx/files/
@ 2015-05-23 15:53 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-05-23 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 48f5c85e860a9a58065f92007734674193fb67ae
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Thu May 21 14:48:52 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu May 21 14:48:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=48f5c85e
sci-libs/calculix-ccx-2.8_p2: several small fixes
- Cleaned up the patch
- Updated the copyright year
- Added missing die's
sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild | 6 +++---
.../01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild
index a4900d4..61feea2 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -58,8 +58,8 @@ src_install () {
dosym ${MY_P} /usr/bin/ccx
if use doc; then
- cd "${S}/../doc"
- ps2pdf ${MY_P}.ps ${MY_P}.pdf
+ cd "${S}/../doc" || die
+ ps2pdf ${MY_P}.ps ${MY_P}.pdf || die "ps2pdf failed"
dodoc ${MY_P}.pdf
fi
diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch
index c9edd9c..a47fdc6 100644
--- a/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch
+++ b/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch
@@ -1,4 +1,5 @@
-diff -ru CalculiX.orig/ccx_2.8p2/src/Makefile CalculiX/ccx_2.8p2/src/Makefile
+Fix Makefile to make it use custom CFLAGS and system libraries.
+
--- CalculiX.orig/ccx_2.8p2/src/Makefile 2015-05-21 11:04:58.125111330 +0300
+++ CalculiX/ccx_2.8p2/src/Makefile 2015-05-21 11:08:26.848130631 +0300
@@ -1,9 +1,9 @@
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-23 15:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-08 10:07 [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/, sci-libs/calculix-ccx/files/ Francois Bissey
-- strict thread matches above, loose matches on Subject: below --
2015-05-23 15:53 Justin Lecher
2014-09-05 15:24 Jauhien Piatlicki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox