| 1 |
commit: a86e22f994318984353a0a6c4223fc8d6a7bf072 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 25 23:26:33 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 25 23:27:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86e22f9 |
| 7 |
|
| 8 |
dev-lang/jsonnet: fix libdir |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/751160 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch | 35 ++++++++++++++++++++++ |
| 15 |
...t-0.16.0-r1.ebuild => jsonnet-0.16.0-r2.ebuild} | 4 +-- |
| 16 |
2 files changed, 37 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch b/dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..552837112d5 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch |
| 23 |
@@ -0,0 +1,35 @@ |
| 24 |
+From 94d25e4845e46b27d0e425dc923480abc81a95ae Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Georgy Yakovlev <gyakovlev@g.o> |
| 26 |
+Date: Sun, 25 Oct 2020 16:21:56 -0700 |
| 27 |
+Subject: [PATCH] respect libdir |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ Makefile | 5 +++-- |
| 31 |
+ 1 file changed, 3 insertions(+), 2 deletions(-) |
| 32 |
+ |
| 33 |
+diff --git a/Makefile b/Makefile |
| 34 |
+index 52c674a..ffcd666 100644 |
| 35 |
+--- a/Makefile |
| 36 |
++++ b/Makefile |
| 37 |
+@@ -30,6 +30,7 @@ OD ?= od |
| 38 |
+ OPT ?= -O3 |
| 39 |
+ |
| 40 |
+ PREFIX ?= /usr/local |
| 41 |
++LIBDIR ?= lib |
| 42 |
+ |
| 43 |
+ CXXFLAGS += -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC |
| 44 |
+ CXXFLAGS += -Iinclude -Ithird_party/md5 -Ithird_party/json |
| 45 |
+@@ -128,8 +129,8 @@ default: jsonnet jsonnetfmt |
| 46 |
+ install: bins libs |
| 47 |
+ mkdir -p $(DESTDIR)$(PREFIX)/bin |
| 48 |
+ cp $(BINS) $(DESTDIR)$(PREFIX)/bin/ |
| 49 |
+- mkdir -p $(DESTDIR)$(PREFIX)/lib |
| 50 |
+- cp $(LIBS) $(DESTDIR)$(PREFIX)/lib/ |
| 51 |
++ mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR) |
| 52 |
++ cp $(LIBS) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ |
| 53 |
+ mkdir -p $(DESTDIR)$(PREFIX)/include |
| 54 |
+ cp $(INCS) $(DESTDIR)$(PREFIX)/include/ |
| 55 |
+ |
| 56 |
+-- |
| 57 |
+2.29.1 |
| 58 |
+ |
| 59 |
|
| 60 |
diff --git a/dev-lang/jsonnet/jsonnet-0.16.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild |
| 61 |
similarity index 92% |
| 62 |
rename from dev-lang/jsonnet/jsonnet-0.16.0-r1.ebuild |
| 63 |
rename to dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild |
| 64 |
index 7df6256a2cc..60961d97d63 100644 |
| 65 |
--- a/dev-lang/jsonnet/jsonnet-0.16.0-r1.ebuild |
| 66 |
+++ b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild |
| 67 |
@@ -34,6 +34,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 68 |
PATCHES=( |
| 69 |
"${FILESDIR}/jsonnet-0.14.0-makefile.patch" |
| 70 |
"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch" |
| 71 |
+ "${FILESDIR}/jsonnet-0.16.0-libdir.patch" |
| 72 |
) |
| 73 |
|
| 74 |
distutils_enable_tests setup.py |
| 75 |
@@ -41,7 +42,6 @@ distutils_enable_tests setup.py |
| 76 |
src_prepare() { |
| 77 |
default |
| 78 |
use python && distutils-r1_src_prepare |
| 79 |
- sed -i "s@\(PREFIX\)/lib@\(PREFIX\)/$(get_libdir)@g" Makefile || die |
| 80 |
} |
| 81 |
|
| 82 |
src_configure() { |
| 83 |
@@ -61,7 +61,7 @@ src_test() { |
| 84 |
} |
| 85 |
|
| 86 |
src_install() { |
| 87 |
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install |
| 88 |
+ emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" LIBDIR="$(get_libdir)" install |
| 89 |
use python && distutils-r1_src_install |
| 90 |
if use doc; then |
| 91 |
find doc -name '.gitignore' -delete || die |
Archives