commit: 570fa2016e62bf634c86be35f44651e97fb66d3a
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 22 14:47:26 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 14:47:26 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=570fa201
sci-mathematics/ripser: fix install location error
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sci-mathematics/ripser/files/ripser-Makefile.patch | 19 ++++++++++---------
sci-mathematics/ripser/ripser-1.1.ebuild | 6 +++++-
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/sci-mathematics/ripser/files/ripser-Makefile.patch
b/sci-mathematics/ripser/files/ripser-Makefile.patch
index bea35a39e..e8135fd27 100644
--- a/sci-mathematics/ripser/files/ripser-Makefile.patch
+++ b/sci-mathematics/ripser/files/ripser-Makefile.patch
@@ -2,17 +2,17 @@ diff --git a/Makefile b/Makefile
index ab410bd..cb0a1c1 100644
--- a/Makefile
+++ b/Makefile
-@@ -1,18 +1,37 @@
+@@ -1,15 +1,35 @@
-build: ripser
+TARGET = ripser
-
+
+DESTDIR ?=
-
+
-all: ripser ripser-coeff ripser-debug
+prefix ?= /usr/local
+exec_prefix ?= $(prefix)
+bindir ?= $(exec_prefix)/bin
-
+
+CFLAGS += -std=c++11 -Wall -Wextra -Wpedantic -Wstrict-overflow
+
+ifeq ($(INDICATE_PROGRESS),1)
@@ -30,21 +30,22 @@ index ab410bd..cb0a1c1 100644
+build: all
+
+all: ripser ripser-coeff
-
+
ripser: ripser.cpp
- c++ -std=c++11 -Wall ripser.cpp -o ripser -Ofast -D NDEBUG
+ $(CXX) $(CFLAGS) $(CXXFLAGS) ripser.cpp -o ripser
-
+
ripser-coeff: ripser.cpp
- c++ -std=c++11 -Wall ripser.cpp -o ripser-coeff -Ofast -D NDEBUG -D
USE_COEFFICIENTS
-
-ripser-debug: ripser.cpp
- c++ -std=c++11 -Wall ripser.cpp -o ripser-debug -g
+ $(CXX) $(CFLAGS) $(CXXFLAGS) -D USE_COEFFICIENTS ripser.cpp -o
ripser-coeff
-
+
+install: all
-+ install -m 755 ripser ripser-coeff $(bindir)
-
++ install -d ${DESTDIR}${bindir}
++ install -m 755 ripser ripser-coeff ${DESTDIR}$(bindir)
+
clean:
- rm -f ripser ripser-coeff ripser-debug
+ rm -f ripser ripser-coeff
diff --git a/sci-mathematics/ripser/ripser-1.1.ebuild
b/sci-mathematics/ripser/ripser-1.1.ebuild
index 0b227a955..653a30258 100644
--- a/sci-mathematics/ripser/ripser-1.1.ebuild
+++ b/sci-mathematics/ripser/ripser-1.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-DESCRIPTION="efficient computation of vietoris-rips persistence barcodes"
+DESCRIPTION="efficient computation of Vietoris-Rips persistence barcodes"
HOMEPAGE="https://ripser.org";
SRC_URI="https://github.com/Ripser/ripser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -27,3 +27,7 @@ src_compile() {
NDEBUG=$(usex debug 0 1)\
all
}
+
+src_install() {
+ emake prefix="/usr" DESTDIR="${D}" install
+}
