Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtomcrypt/
Date: Wed, 20 Oct 2021 19:01:52
Message-Id: 1634756500.c90ab38e3577aae61fac2341b34ad593948de1cd.floppym@gentoo
1 commit: c90ab38e3577aae61fac2341b34ad593948de1cd
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 20 16:07:40 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 20 19:01:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90ab38e
7
8 dev-libs/libtomcrypt: fix paths in libtomcrypt.pc
9
10 libtomcrypt.pc looks like this:
11
12 ```
13 prefix=/usr/local
14 exec_prefix=${prefix}
15 libdir=${exec_prefix}/lib
16 includedir=${prefix}/include
17 ```
18
19 Set the correct PREFIX and replace the hard-coded "/lib" in libdir.
20
21 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
22
23 .../{libtomcrypt-1.18.2-r2.ebuild => libtomcrypt-1.18.2-r3.ebuild} | 4 ++++
24 1 file changed, 4 insertions(+)
25
26 diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
27 similarity index 95%
28 rename from dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
29 rename to dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
30 index 635ce69ed4a..6626d089598 100644
31 --- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
32 +++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
33 @@ -82,10 +82,14 @@ mymake() {
34 LIBPATH="${ESYSROOT}/usr/$(get_libdir)" \
35 INCPATH="${ESYSROOT}/usr/include" \
36 IGNORE_SPEED=1 \
37 + PREFIX="${EPREFIX}/usr" \
38 "${@}"
39 }
40
41 src_compile() {
42 + # Replace hard-coded libdir=${exec_prefix}/lib.
43 + sed -i -e "/libdir=/s:/lib:/$(get_libdir):" libtomcrypt.pc.in || die
44 +
45 mymake -f makefile.shared library
46 }