commit: a86e22f994318984353a0a6c4223fc8d6a7bf072 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Sun Oct 25 23:26:33 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Sun Oct 25 23:27:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86e22f9
dev-lang/jsonnet: fix libdir Closes: https://bugs.gentoo.org/751160 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch | 35 ++++++++++++++++++++++ ...t-0.16.0-r1.ebuild => jsonnet-0.16.0-r2.ebuild} | 4 +-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch b/dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch new file mode 100644 index 00000000000..552837112d5 --- /dev/null +++ b/dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch @@ -0,0 +1,35 @@ +From 94d25e4845e46b27d0e425dc923480abc81a95ae Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <[email protected]> +Date: Sun, 25 Oct 2020 16:21:56 -0700 +Subject: [PATCH] respect libdir + +--- + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 52c674a..ffcd666 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,6 +30,7 @@ OD ?= od + OPT ?= -O3 + + PREFIX ?= /usr/local ++LIBDIR ?= lib + + CXXFLAGS += -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC + CXXFLAGS += -Iinclude -Ithird_party/md5 -Ithird_party/json +@@ -128,8 +129,8 @@ default: jsonnet jsonnetfmt + install: bins libs + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp $(BINS) $(DESTDIR)$(PREFIX)/bin/ +- mkdir -p $(DESTDIR)$(PREFIX)/lib +- cp $(LIBS) $(DESTDIR)$(PREFIX)/lib/ ++ mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR) ++ cp $(LIBS) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ + mkdir -p $(DESTDIR)$(PREFIX)/include + cp $(INCS) $(DESTDIR)$(PREFIX)/include/ + +-- +2.29.1 + diff --git a/dev-lang/jsonnet/jsonnet-0.16.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild similarity index 92% rename from dev-lang/jsonnet/jsonnet-0.16.0-r1.ebuild rename to dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild index 7df6256a2cc..60961d97d63 100644 --- a/dev-lang/jsonnet/jsonnet-0.16.0-r1.ebuild +++ b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild @@ -34,6 +34,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" PATCHES=( "${FILESDIR}/jsonnet-0.14.0-makefile.patch" "${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch" + "${FILESDIR}/jsonnet-0.16.0-libdir.patch" ) distutils_enable_tests setup.py @@ -41,7 +42,6 @@ distutils_enable_tests setup.py src_prepare() { default use python && distutils-r1_src_prepare - sed -i "s@\(PREFIX\)/lib@\(PREFIX\)/$(get_libdir)@g" Makefile || die } src_configure() { @@ -61,7 +61,7 @@ src_test() { } src_install() { - emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install + emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" LIBDIR="$(get_libdir)" install use python && distutils-r1_src_install if use doc; then find doc -name '.gitignore' -delete || die
