* [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/meschach/files/, sci-libs/meschach/
@ 2021-04-11 20:22 Alessandro Barbieri
0 siblings, 0 replies; 2+ messages in thread
From: Alessandro Barbieri @ 2021-04-11 20:22 UTC (permalink / raw
To: gentoo-commits
commit: fa49691bc1b5a7cbf6adce592fd8889532ff44a6
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr 11 20:21:26 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Apr 11 20:21:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa49691b
sci-libs/meschach: respect flags, remove useless binaries
Closes: https://bugs.gentoo.org/781644
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sci-libs/meschach/files/makefile.patch | 116 +++++++++++++++++++++++++++++++++
sci-libs/meschach/meschach-1.2b.ebuild | 26 ++++----
2 files changed, 129 insertions(+), 13 deletions(-)
diff --git a/sci-libs/meschach/files/makefile.patch b/sci-libs/meschach/files/makefile.patch
new file mode 100644
index 000000000..9c2fb918d
--- /dev/null
+++ b/sci-libs/meschach/files/makefile.patch
@@ -0,0 +1,116 @@
+--- a/makefile.in 2021-04-11 20:54:38.081969329 +0200
++++ b/makefile.in 2021-04-11 21:42:48.789853703 +0200
+@@ -18,8 +18,7 @@
+ LIBS = @LIBS@
+ RANLIB = @RANLIB@
+
+-
+-CFLAGS = -O3 -fPIC
++CFLAGS += -fPIC
+
+
+ .c.o:
+@@ -80,45 +79,45 @@
+
+ $(LIST1): $(HBASE)
+ part1: $(LIST1)
+- ar ru libmeschach.a $(LIST1)
++ $(AR) ru libmeschach.a $(LIST1)
+ $(RANLIB) libmeschach.a
+ # $(CC) -shared -o libmeschach.so $(LIST1)
+
+ $(LIST2): $(HBASE) matrix2.h
+ part2: $(LIST2)
+- ar ru libmeschach.a $(LIST2)
++ $(AR) ru libmeschach.a $(LIST2)
+ $(RANLIB) libmeschach.a
+ # $(CC) -shared -o libmeschach.so $(LIST2)
+
+ $(LIST3): $(HBASE) sparse.h sparse2.h
+ part3: $(LIST3)
+- ar ru libmeschach.a $(LIST3)
++ $(AR) ru libmeschach.a $(LIST3)
+ $(RANLIB) libmeschach.a
+ # $(CC) -shared -o libmeschach.so $(LIST3)
+
+ $(ZLIST1): $(HBASDE) zmatrix.h
+ zpart1: $(ZLIST1)
+- ar ru libmeschach.a $(ZLIST1)
++ $(AR) ru libmeschach.a $(ZLIST1)
+ $(RANLIB) libmeschach.a
+ # $(CC) -shared -o libmeschach.so $(ZLIST1)
+
+ $(ZLIST2): $(HBASE) zmatrix.h zmatrix2.h
+ zpart2: $(ZLIST2)
+- ar ru libmeschach.a $(ZLIST2)
++ $(AR) ru libmeschach.a $(ZLIST2)
+ $(RANLIB) libmeschach.a
+ # $(CC) -shared -o libmeschach.so $(ZLIST2)
+
+ $(OLDLIST): $(HBASE) sparse.h sparse2.h
+ oldpart: $(OLDLIST)
+- ar ru libmeschach.a $(OLDLIST)
++ $(AR) ru libmeschach.a $(OLDLIST)
+ $(RANLIB) libmeschach.a
+ # $(CC) -shared -o libmeschach.so $(OLDLIST)
+
+ shared: $(ALL_LISTS)
+- $(CC) -shared -o libmeschach.so $(ALL_LISTS) -lc -lm -Wl,-soname -Wl,libmeschach.so.$(vers)
++ $(CC) $(LDFLAGS) -shared -o libmeschach.so $(ALL_LISTS) -lc -lm -Wl,-soname -Wl,libmeschach.so.$(vers)
+
+ static: $(ALL_LISTS)
+- ar ru libmeschach.a $(ALL_LISTS)
++ $(AR) ru libmeschach.a $(ALL_LISTS)
+ $(RANLIB) libmeschach.a
+
+
+@@ -200,31 +199,31 @@
+ alltorture: torture sptort ztorture memtort itertort mfuntort iotort
+
+ torture:torture.o libmeschach.a
+- $(CC) $(CFLAGS) $(DEFS) -o torture torture.o \
+- libmeschach.a $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o torture torture.o \
++ -lmeschach -L. $(LIBS)
+ sptort:sptort.o libmeschach.a
+- $(CC) $(CFLAGS) $(DEFS) -o sptort sptort.o \
+- libmeschach.a $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o sptort sptort.o \
++ -lmeschach -L. $(LIBS)
+ memtort: memtort.o libmeschach.a
+- $(CC) $(CFLAGS) $(DEFS) -o memtort memtort.o \
+- libmeschach.a $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o memtort memtort.o \
++ -lmeschach -L. $(LIBS)
+ ztorture:ztorture.o libmeschach.a
+- $(CC) $(CFLAGS) $(DEFS) -o ztorture ztorture.o \
+- libmeschach.a $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o ztorture ztorture.o \
++ -lmeschach -L. $(LIBS)
+ itertort: itertort.o libmeschach.a
+- $(CC) $(CFLAGS) $(DEFS) -o itertort itertort.o \
+- libmeschach.a $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o itertort itertort.o \
++ -lmeschach -L. $(LIBS)
+
+ iotort: iotort.o libmeschach.a
+- $(CC) $(CFLAGS) $(DEFS) -o iotort iotort.o \
+- libmeschach.a $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o iotort iotort.o \
++ -lmeschach -L. $(LIBS)
+ mfuntort: mfuntort.o libmeschach.a
+- $(CC) $(CFLAGS) $(DEFS) -o mfuntort mfuntort.o \
+- libmeschach.a $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o mfuntort mfuntort.o \
++ -lmeschach -L. $(LIBS)
+ tstmove: tstmove.o libmeschach.a
+- $(CC) $(CFLAGS) $(DEFS) -o tstmove tstmove.o \
+- libmeschach.a $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o tstmove tstmove.o \
++ -lmeschach -L. $(LIBS)
+ tstpxvec: tstpxvec.o libmeschach.a
+- $(CC) $(CFLAGS) $(DEFS) -o tstpxvec tstpxvec.o \
+- libmeschach.a $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o tstpxvec tstpxvec.o \
++ -lmeschach -L. $(LIBS)
+
diff --git a/sci-libs/meschach/meschach-1.2b.ebuild b/sci-libs/meschach/meschach-1.2b.ebuild
index e03916d34..2f534ad10 100644
--- a/sci-libs/meschach/meschach-1.2b.ebuild
+++ b/sci-libs/meschach/meschach-1.2b.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-inherit autotools eutils
+inherit autotools eutils toolchain-funcs
MAJOR="$(ver_cut 1)"
VERSION="$(ver_cut 1-2)"
-DESCRIPTION="Meschach is a C-language library of routines for performing matrix computations."
+DESCRIPTION="Meschach is a C-language library of routines for performing matrix computations"
HOMEPAGE="http://homepage.divms.uiowa.edu/~dstewart/meschach"
-SRC_URI="http://cdn-fastly.deb.debian.org/debian/pool/main/m/meschach/${PN}_${PV}.orig.tar.gz \
-http://cdn-fastly.deb.debian.org/debian/pool/main/m/meschach/${PN}_${PV}-14.debian.tar.xz"
-
+SRC_URI="
+ http://cdn-fastly.deb.debian.org/debian/pool/main/m/meschach/${PN}_${PV}.orig.tar.gz
+ http://cdn-fastly.deb.debian.org/debian/pool/main/m/meschach/${PN}_${PV}-14.debian.tar.xz
+"
LICENSE="meschach"
SLOT="0"
KEYWORDS="~amd64"
@@ -25,13 +26,14 @@ REQUIRED_USE="
PATCHES=(
"${WORKDIR}/debian/patches/${PN}_${PV}-13.diff"
"${WORKDIR}/debian/patches/${PN}_${PV}-13.configure.diff"
+ "${FILESDIR}/makefile.patch"
)
src_prepare() {
default
- sed -i -- 's/CFLAGS = -O3 -fPIC/CFLAGS = @CFLAGS@ -fPIC/g' makefile.in
use old && sed -i -- 's/all: shared static/all: oldpart shared static/g' makefile.in
- mv configure.in configure.ac
+ mv configure.in configure.ac || die
+ export AR="$(tc-getAR)"
eautoreconf
}
@@ -49,13 +51,13 @@ src_configure() {
}
src_compile() {
- emake vers="${VERSION}" DESTDIR="${D}" all
+ emake vers="${VERSION}" all
emake alltorture
}
src_install() {
- ln -s "lib${PN}.so" "lib${PN}.so.${MAJOR}"
- ln -s "lib${PN}.so.${MAJOR}" "lib${PN}.so.${VERSION}"
+ ln -s "lib${PN}.so" "lib${PN}.so.${MAJOR}" || die
+ ln -s "lib${PN}.so.${MAJOR}" "lib${PN}.so.${VERSION}" || die
dolib.so "lib${PN}.so"
dolib.so "lib${PN}.so.${MAJOR}"
dolib.so "lib${PN}.so.${VERSION}"
@@ -66,8 +68,6 @@ src_install() {
exeinto "/usr/libexec/${PN}"
doexe iotort
doexe itertort
- doexe macheps
- doexe maxint
doexe memtort
doexe mfuntort
doexe sptort
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/meschach/files/, sci-libs/meschach/
@ 2021-05-16 14:06 Anna Vyalkova
0 siblings, 0 replies; 2+ messages in thread
From: Anna Vyalkova @ 2021-05-16 14:06 UTC (permalink / raw
To: gentoo-commits
commit: dd6ff2f5c2f7887079934c95554adf61efb62506
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Sun May 16 13:43:18 2021 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun May 16 14:05:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd6ff2f5
sci-libs/meschach: fix CC
Closes: https://bugs.gentoo.org/785196
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>
sci-libs/meschach/files/configure.patch | 29 +++++++++++++++++++++++++++++
sci-libs/meschach/meschach-1.2b.ebuild | 3 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/sci-libs/meschach/files/configure.patch b/sci-libs/meschach/files/configure.patch
new file mode 100644
index 000000000..858196846
--- /dev/null
+++ b/sci-libs/meschach/files/configure.patch
@@ -0,0 +1,29 @@
+Bug: https://bugs.gentoo.org/785196
+
+--- a/configure.in
++++ b/configure.in
+@@ -9,16 +9,6 @@
+ [extern int test (int i, double x);],
+ AC_DEFINE(HAVE_PROTOTYPES))])dnl
+ dnl
+-dnl Brook Milligan's compiler check
+-dnl Check for the sun ansi c compiler, acc
+-define(LOCAL_PROG_ACC,
+-[AC_BEFORE([$0], [AC_PROG_CPP])AC_PROVIDE([$0])dnl
+-AC_PROGRAM_CHECK(CC, acc, acc, "")])dnl
+-dnl David Stewart's modified compiler check
+-define(LOCAL_PROG_CC,
+-[AC_BEFORE([$0], [AC_PROG_CPP])AC_PROVIDE([$0])dnl
+-AC_PROGRAM_CHECK(CC, acc, acc, cc)])dnl
+-dnl
+ dnl
+ dnl
+ dnl ----------------------------------------------------------------------
+@@ -29,7 +19,6 @@
+ PROGS=""
+ AC_SUBST(PROGS)dnl
+ LOCAL_PROG_ACC
+-AC_PROGRAM_CHECK(CC, cc, cc, gcc)
+ dnl AC_PROG_CC
+ AC_PROG_CPP
+ AC_AIX
diff --git a/sci-libs/meschach/meschach-1.2b.ebuild b/sci-libs/meschach/meschach-1.2b.ebuild
index 2f534ad10..b1f5b41bd 100644
--- a/sci-libs/meschach/meschach-1.2b.ebuild
+++ b/sci-libs/meschach/meschach-1.2b.ebuild
@@ -27,13 +27,14 @@ PATCHES=(
"${WORKDIR}/debian/patches/${PN}_${PV}-13.diff"
"${WORKDIR}/debian/patches/${PN}_${PV}-13.configure.diff"
"${FILESDIR}/makefile.patch"
+ "${FILESDIR}/configure.patch"
)
src_prepare() {
default
use old && sed -i -- 's/all: shared static/all: oldpart shared static/g' makefile.in
mv configure.in configure.ac || die
- export AR="$(tc-getAR)"
+ tc-export AR CC
eautoreconf
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-16 14:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-16 14:06 [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/meschach/files/, sci-libs/meschach/ Anna Vyalkova
-- strict thread matches above, loose matches on Subject: below --
2021-04-11 20:22 Alessandro Barbieri
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox