Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/trousers/, app-crypt/trousers/files/
Date: Thu, 25 Jun 2020 08:08:36
Message-Id: 1593072463.ab24dd5b2a618468b4ec566fdaad537a44847c21.juippis@gentoo
1 commit: ab24dd5b2a618468b4ec566fdaad537a44847c21
2 Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
3 AuthorDate: Sun Jun 7 17:49:53 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 25 08:07:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab24dd5b
7
8 app-crypt/trousers: Prevent install of stray static archive
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 ...ers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch | 25 ++++++++++++++++++++++
15 app-crypt/trousers/trousers-0.3.14-r2.ebuild | 1 +
16 2 files changed, 26 insertions(+)
17
18 diff --git a/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch b/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch
19 new file mode 100644
20 index 00000000000..f777b629ceb
21 --- /dev/null
22 +++ b/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch
23 @@ -0,0 +1,25 @@
24 +From 5b1dbb5f8eada9002ec10f4ebc0bc418272e58b2 Mon Sep 17 00:00:00 2001
25 +From: Salah Coronya <salah.coronya@×××××.com>
26 +Date: Sun, 7 Jun 2020 12:34:03 -0500
27 +Subject: [PATCH] src/tddl/Makefile.am: Mark tddl.a nodist
28 +
29 +This makes tddl.a nodist like the others, so it is not installed
30 +
31 +Signed-off-by: Salah Coronya <salah.coronya@×××××.com>
32 +---
33 + src/tddl/Makefile.am | 2 +-
34 + 1 file changed, 1 insertion(+), 1 deletion(-)
35 +
36 +diff --git a/src/tddl/Makefile.am b/src/tddl/Makefile.am
37 +index 607eb8e..2cd599b 100644
38 +--- a/src/tddl/Makefile.am
39 ++++ b/src/tddl/Makefile.am
40 +@@ -1,4 +1,4 @@
41 +-lib_LIBRARIES=libtddl.a
42 ++noinst_LIBRARIES=libtddl.a
43 +
44 + libtddl_a_SOURCES=tddl.c
45 + libtddl_a_CFLAGS=-DAPPID=\"TCSD\ TDDL\" -I${top_srcdir}/src/include -fPIE -DPIE
46 +--
47 +2.26.2
48 +
49
50 diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
51 index b62a9eb9345..a36ff683073 100644
52 --- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild
53 +++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
54 @@ -30,6 +30,7 @@ PATCHES=(
55 "${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
56 "${FILESDIR}/${P}-libressl.patch"
57 "${FILESDIR}/${P}-fno-common.patch"
58 + "${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch"
59 )
60
61 DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"