* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/fasthenry/, sci-electronics/fasthenry/files/
@ 2020-10-18 20:05 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2020-10-18 20:05 UTC (permalink / raw
To: gentoo-commits
commit: fc4ee19d281cd3ecd973f03ecccd3e25603f1c89
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 20:05:12 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 20:05:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc4ee19d
sci-electronics/fasthenry: Version bump
Closes: https://bugs.gentoo.org/723632
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sci-electronics/fasthenry/Manifest | 1 +
.../fasthenry/fasthenry-3.0.20.07.17.ebuild | 37 +++++++++++++++++
.../files/fasthenry-3.0.20.07.17-cflags.patch | 48 ++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/sci-electronics/fasthenry/Manifest b/sci-electronics/fasthenry/Manifest
index 1674dfd6b72..93ff7b621b6 100644
--- a/sci-electronics/fasthenry/Manifest
+++ b/sci-electronics/fasthenry/Manifest
@@ -1 +1,2 @@
+DIST fasthenry-3.0wr-071720.tar.gz 5196905 BLAKE2B 577e1b6c9b5483144f54de96439a2f11d41bfe54fbd9973084c2e17d180843ceaaa946899ae1bc71ef7dcf3b048da9775f2015fe03ce01ece67f66f998adba9b SHA512 90419c9e8cbdbb16dcb34db65e4e87643cbdbfad980012ea8c08d4fc062a113e388a38705d4d5af3970107ff71630fe7afe3b29e1de731c147798e683ec71cd3
DIST fasthenry-3.0wr-082514.tar.gz 3738940 BLAKE2B 3fd5d45e047725bf04299bf77f7385f42faa68d234a06f57cc494684a65e1c02d3879cb42a02dc3f53b0a63b5f5caf5d0a24ae1182ef19695e37a758b9bdb5e1 SHA512 53764d2eb5577d89934ad882af0eeadc6196d95a9c22cd6648e0c342c33ef1d8289b3b6c9ef48662ae4611e2bf914e4c4a68ddc536dc7921e0296cd59c5f3538
diff --git a/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
new file mode 100644
index 00000000000..5e4970bb32f
--- /dev/null
+++ b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Three dimensional inductance computation program, Whiteley Research version"
+HOMEPAGE="http://www.wrcad.com/freestuff.html"
+SRC_URI="http://www.wrcad.com/ftp/pub/fasthenry-$(ver_cut 1-2)wr-$(ver_cut 4)$(ver_cut 5)$(ver_cut 3).tar.gz"
+
+LICENSE="all-rights-reserved"
+RESTRICT="mirror bindist"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}/fasthenry-3.0wr
+
+PATCHES=(
+ "${FILESDIR}/${P}-cflags.patch"
+)
+
+src_compile() {
+ tc-export CC
+ emake all
+}
+
+src_install() {
+ dobin bin/fasthenry
+ dobin bin/zbuf
+ dodoc -r doc/*
+ dodoc -r examples
+}
diff --git a/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-cflags.patch b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-cflags.patch
new file mode 100644
index 00000000000..7053406cb26
--- /dev/null
+++ b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-cflags.patch
@@ -0,0 +1,48 @@
+diff -ruN fasthenry-3.0wr.orig/src/fasthenry/mk_syscfg.inc fasthenry-3.0wr/src/fasthenry/mk_syscfg.inc
+--- fasthenry-3.0wr.orig/src/fasthenry/mk_syscfg.inc 2020-07-23 01:18:06.000000000 +0300
++++ fasthenry-3.0wr/src/fasthenry/mk_syscfg.inc 2020-10-18 23:01:19.019207947 +0300
+@@ -2,7 +2,7 @@
+ # except for MinGW.
+
+ #CFLAGS = -O -g -DFOUR
+-CFLAGS = -O3 -DFOUR
++CFLAGS += -DFOUR
+
+ # For MinGW, there is no getrusage, and we'll skip a gethostname call
+ # to avoid having to link with winsock.
+@@ -12,4 +12,4 @@
+
+ # We're going to assume gcc, you'll need to comment this if a
+ # non-compatible compiler is used.
+-CC := gcc
++#CC := gcc
+diff -ruN fasthenry-3.0wr.orig/src/sparse/Makefile fasthenry-3.0wr/src/sparse/Makefile
+--- fasthenry-3.0wr.orig/src/sparse/Makefile 2019-09-02 21:41:53.000000000 +0300
++++ fasthenry-3.0wr/src/sparse/Makefile 2020-10-18 23:01:49.339387549 +0300
+@@ -4,7 +4,7 @@
+ # UC Berkeley
+ #
+ #CFLAGS = -O -g
+-CFLAGS = -O3
++#CFLAGS = -O3
+ LINTFLAGS = -lc -lm
+ SHELL = /bin/sh
+ #CC = cc
+diff -ruN fasthenry-3.0wr.orig/src/zbuf/mk_syscfg.inc fasthenry-3.0wr/src/zbuf/mk_syscfg.inc
+--- fasthenry-3.0wr.orig/src/zbuf/mk_syscfg.inc 2020-07-23 01:18:23.000000000 +0300
++++ fasthenry-3.0wr/src/zbuf/mk_syscfg.inc 2020-10-18 23:01:19.019207947 +0300
+@@ -2,7 +2,7 @@
+ # except for MinGW.
+
+ #CFLAGS = -O -g -DFOUR
+-CFLAGS = -O3 -DFOUR
++CFLAGS += -DFOUR
+
+ # For MinGW, there is no getrusage, and we'll skip a gethostname call
+ # to avoid having to link with winsock.
+@@ -12,4 +12,4 @@
+
+ # We're going to assume gcc, you'll need to comment this if a
+ # non-compatible compiler is used.
+-CC := gcc
++#CC := gcc
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/fasthenry/, sci-electronics/fasthenry/files/
@ 2020-10-24 15:33 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2020-10-24 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 78a8fc1ae1230167345e29479940f512b560e154
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 15:32:12 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 15:33:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a8fc1a
sci-electronics/fasthenry: Fix LDFLAGS
Closes: https://bugs.gentoo.org/750134
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../fasthenry/fasthenry-3.0.20.07.17.ebuild | 1 +
.../files/fasthenry-3.0.20.07.17-ldflags.patch | 40 ++++++++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
index 5e4970bb32f..b8691f8986a 100644
--- a/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
+++ b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
@@ -22,6 +22,7 @@ S=${WORKDIR}/fasthenry-3.0wr
PATCHES=(
"${FILESDIR}/${P}-cflags.patch"
+ "${FILESDIR}/${P}-ldflags.patch"
)
src_compile() {
diff --git a/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ldflags.patch b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ldflags.patch
new file mode 100644
index 00000000000..198f2f7e74f
--- /dev/null
+++ b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ldflags.patch
@@ -0,0 +1,40 @@
+diff -ruN fasthenry-3.0wr.orig/src/fasthenry/Makefile fasthenry-3.0wr/src/fasthenry/Makefile
+--- fasthenry-3.0wr.orig/src/fasthenry/Makefile 2020-07-12 19:17:05.000000000 +0300
++++ fasthenry-3.0wr/src/fasthenry/Makefile 2020-10-24 18:27:20.624660092 +0300
+@@ -49,7 +49,7 @@
+ @if [ $(SOLVER) = SPARSE_SOLVER ]; then \
+ cd ../sparse; make CC=$(CC); \
+ fi
+- $(CC) -o fasthenry $(CFLAGS) $(OBJS) $(MOBJS) $(NONUNIOBJS) $(SOLVERLIB) -lm
++ $(CC) -o fasthenry $(LDFLAGS) $(CFLAGS) $(OBJS) $(MOBJS) $(NONUNIOBJS) $(SOLVERLIB) -lm
+ mv fasthenry $(BIN)/fasthenry
+
+ clean:
+diff -ruN fasthenry-3.0wr.orig/src/misc/Makefile fasthenry-3.0wr/src/misc/Makefile
+--- fasthenry-3.0wr.orig/src/misc/Makefile 2019-03-21 23:10:58.000000000 +0200
++++ fasthenry-3.0wr/src/misc/Makefile 2020-10-24 18:28:12.805126140 +0300
+@@ -1,10 +1,10 @@
+ all: MakeLcircuit ReadOutput
+
+ MakeLcircuit: MakeLcircuit.c
+- $(CC) -O -o MakeLcircuit MakeLcircuit.c -lm
++ $(CC) $(LDFLAGS) $(CFLAGS) -o MakeLcircuit MakeLcircuit.c -lm
+
+ ReadOutput: ReadOutput.c
+- $(CC) -O -o ReadOutput ReadOutput.c -lm
++ $(CC) $(LDFLAGS) $(CFLAGS) -o ReadOutput ReadOutput.c -lm
+
+ clean::
+ -@rm -f *.o MakeLcircuit ReadOutput
+diff -ruN fasthenry-3.0wr.orig/src/zbuf/Makefile fasthenry-3.0wr/src/zbuf/Makefile
+--- fasthenry-3.0wr.orig/src/zbuf/Makefile 2019-09-08 22:53:50.000000000 +0300
++++ fasthenry-3.0wr/src/zbuf/Makefile 2020-10-24 18:29:50.686000362 +0300
+@@ -41,7 +41,7 @@
+ LIBS = -lm
+
+ zbuf: $(OBJS)
+- $(CC) -o zbuf $(CFLAGS) $(OBJS) $(LIBS)
++ $(CC) $(LDFLAGS) -o zbuf $(CFLAGS) $(OBJS) $(LIBS)
+ mv zbuf $(BIN)/zbuf
+
+ clean:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/fasthenry/, sci-electronics/fasthenry/files/
@ 2020-10-24 15:40 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2020-10-24 15:40 UTC (permalink / raw
To: gentoo-commits
commit: bd3e4d8ba482580f3db048d241aee4c4e65c5c6e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 15:39:28 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 15:40:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3e4d8b
sci-electronics/fasthenry: Fix ar
Closes: https://bugs.gentoo.org/750128
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../fasthenry/fasthenry-3.0.20.07.17.ebuild | 3 ++-
.../fasthenry/files/fasthenry-3.0.20.07.17-ar.patch | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
index b8691f8986a..ee1cef974df 100644
--- a/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
+++ b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
@@ -23,10 +23,11 @@ S=${WORKDIR}/fasthenry-3.0wr
PATCHES=(
"${FILESDIR}/${P}-cflags.patch"
"${FILESDIR}/${P}-ldflags.patch"
+ "${FILESDIR}/${P}-ar.patch"
)
src_compile() {
- tc-export CC
+ tc-export CC AR
emake all
}
diff --git a/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ar.patch b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ar.patch
new file mode 100644
index 00000000000..ea1e671b7df
--- /dev/null
+++ b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ar.patch
@@ -0,0 +1,18 @@
+diff -ruN fasthenry-3.0wr.orig/src/sparse/Makefile fasthenry-3.0wr/src/sparse/Makefile
+--- fasthenry-3.0wr.orig/src/sparse/Makefile 2020-10-24 18:35:15.348900086 +0300
++++ fasthenry-3.0wr/src/sparse/Makefile 2020-10-24 18:37:09.729921680 +0300
+@@ -25,12 +25,12 @@
+ # $(CC) $(CFLAGS) -o $(DESTINATION) $(TESTO) $(LIBRARY) -lm
+
+ $(LIBRARY) : $(OFILES)
+- ar r $(LIBRARY) $?
++ $(AR) r $(LIBRARY) $?
+ ranlib $(LIBRARY)
+
+ spice : $(LIBRARY) spSMP.o
+ cp $(LIBRARY) ../SMP.a
+- ar r ../SMP.a spSMP.o
++ $(AR) r ../SMP.a spSMP.o
+ ranlib ../SMP.a
+
+ lint :
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-24 15:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-24 15:33 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/fasthenry/, sci-electronics/fasthenry/files/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2020-10-24 15:40 Andreas K. Hüttel
2020-10-18 20:05 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox