| 1 |
commit: 8fc8b0f3f4e3c4aac5ecbf81c5a9d1d1e9769d1b |
| 2 |
Author: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> |
| 3 |
AuthorDate: Tue Jan 22 13:31:48 2019 +0000 |
| 4 |
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> |
| 5 |
CommitDate: Tue Jan 22 13:31:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=8fc8b0f3 |
| 7 |
|
| 8 |
app-arch/libdeflate: make a patch to fix EPREFIX installations |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
| 11 |
Signed-off-by: Martin Mokrejs <mmokrejs <AT> fold.natur.cuni.cz> |
| 12 |
|
| 13 |
.../files/libdeflate-1.2-respect_EPREFIX.patch | 54 ++++++++++++++++++++++ |
| 14 |
app-arch/libdeflate/libdeflate-1.2.ebuild | 9 ++-- |
| 15 |
2 files changed, 57 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch b/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000..a583d7d2e |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch |
| 22 |
@@ -0,0 +1,54 @@ |
| 23 |
+--- libdeflate-1.2/Makefile 2019-01-15 06:37:48.000000000 +0100 |
| 24 |
++++ libdeflate-1.2/Makefile 2019-01-22 14:06:13.427054892 +0100 |
| 25 |
+@@ -21,7 +21,7 @@ |
| 26 |
+ 1>&2 2>/dev/null; then echo $(1); fi) |
| 27 |
+ |
| 28 |
+ override CFLAGS := \ |
| 29 |
+- $(CFLAGS) -O2 -fomit-frame-pointer -std=c99 -I. -Icommon \ |
| 30 |
++ -O2 $(CFLAGS) -fomit-frame-pointer -std=c99 -I. -Icommon \ |
| 31 |
+ -Wall -Wundef \ |
| 32 |
+ $(call cc-option,-Wpedantic) \ |
| 33 |
+ $(call cc-option,-Wdeclaration-after-statement) \ |
| 34 |
+@@ -34,6 +34,9 @@ |
| 35 |
+ ############################################################################## |
| 36 |
+ |
| 37 |
+ PREFIX ?= /usr |
| 38 |
++BINDIR ?= $(PREFIX)/bin |
| 39 |
++INCDIR ?= $(PREFIX)/include |
| 40 |
++LIBDIR ?= $(PREFIX)/lib |
| 41 |
+ |
| 42 |
+ SOVERSION := 0 |
| 43 |
+ STATIC_LIB_SUFFIX := .a |
| 44 |
+@@ -240,20 +243,20 @@ |
| 45 |
+ all:$(DEFAULT_TARGETS) |
| 46 |
+ |
| 47 |
+ install:all |
| 48 |
+- install -Dm644 -t $(DESTDIR)$(PREFIX)/lib $(STATIC_LIB) |
| 49 |
+- install -Dm755 -t $(DESTDIR)$(PREFIX)/lib $(SHARED_LIB) |
| 50 |
+- ln -sf $(SHARED_LIB) $(DESTDIR)$(PREFIX)/lib/libdeflate.so |
| 51 |
+- install -Dm644 -t $(DESTDIR)$(PREFIX)/include libdeflate.h |
| 52 |
+- install -Dm755 gzip $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip |
| 53 |
+- ln -f $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip $(DESTDIR)$(PREFIX)/bin/libdeflate-gunzip |
| 54 |
++ install -Dm644 -t $(DESTDIR)$(LIBDIR) $(STATIC_LIB) |
| 55 |
++ install -Dm755 -t $(DESTDIR)$(LIBDIR) $(SHARED_LIB) |
| 56 |
++ ln -sf $(SHARED_LIB) $(DESTDIR)$(LIBDIR)/libdeflate.so |
| 57 |
++ install -Dm644 -t $(DESTDIR)$(INCDIR) libdeflate.h |
| 58 |
++ install -Dm755 gzip $(DESTDIR)$(BINDIR)/libdeflate-gzip |
| 59 |
++ ln -f $(DESTDIR)$(BINDIR)/libdeflate-gzip $(DESTDIR)$(BINDIR)/libdeflate-gunzip |
| 60 |
+ |
| 61 |
+ uninstall: |
| 62 |
+- rm -f $(DESTDIR)$(PREFIX)/lib/$(STATIC_LIB) \ |
| 63 |
+- $(DESTDIR)$(PREFIX)/lib/$(SHARED_LIB) \ |
| 64 |
+- $(DESTDIR)$(PREFIX)/lib/libdeflate.so \ |
| 65 |
+- $(DESTDIR)$(PREFIX)/include/libdeflate.h \ |
| 66 |
+- $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip \ |
| 67 |
+- $(DESTDIR)$(PREFIX)/bin/libdeflate-gunzip |
| 68 |
++ rm -f $(DESTDIR)$(LIBDIR)/$(STATIC_LIB) \ |
| 69 |
++ $(DESTDIR)$(LIBDIR)/$(SHARED_LIB) \ |
| 70 |
++ $(DESTDIR)$(LIBDIR)/libdeflate.so \ |
| 71 |
++ $(DESTDIR)$(INCDIR)/libdeflate.h \ |
| 72 |
++ $(DESTDIR)$(BINDIR)/libdeflate-gzip \ |
| 73 |
++ $(DESTDIR)$(BINDIR)/libdeflate-gunzip |
| 74 |
+ |
| 75 |
+ test_programs:$(TEST_PROGRAMS) |
| 76 |
+ |
| 77 |
|
| 78 |
diff --git a/app-arch/libdeflate/libdeflate-1.2.ebuild b/app-arch/libdeflate/libdeflate-1.2.ebuild |
| 79 |
index a4baea15e..5548ea150 100644 |
| 80 |
--- a/app-arch/libdeflate/libdeflate-1.2.ebuild |
| 81 |
+++ b/app-arch/libdeflate/libdeflate-1.2.ebuild |
| 82 |
@@ -18,15 +18,12 @@ DEPEND="" |
| 83 |
RDEPEND="${DEPEND}" |
| 84 |
BDEPEND="" |
| 85 |
|
| 86 |
-src_prepare(){ |
| 87 |
- sed -e 's/ -O2 / /' -i Makefile || die |
| 88 |
- sed -e "s#${DESTDIR}${PREFIX}/lib#${ED}/usr/$(get_libdir)#" -i Makefile || die |
| 89 |
- default |
| 90 |
-} |
| 91 |
+PATCHES=( "${FILESDIR}"/libdeflate-1.2-respect_EPREFIX.patch ) |
| 92 |
|
| 93 |
src_install() { |
| 94 |
- default |
| 95 |
if ! use static-libs; then |
| 96 |
find "${ED}" -name '*.a' -delete || die |
| 97 |
fi |
| 98 |
+ emake install DESTDIR="${ED}" LIBDIR=/usr/"$(get_libdir)" |
| 99 |
+ dodoc NEWS README.md |
| 100 |
} |
Archives