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/aescrypt/files/, app-crypt/aescrypt/
Date: Fri, 16 Jul 2021 11:46:23
Message-Id: 1626435973.4cd20ef753adcbf7fae65db20d028c90b7e459bc.juippis@gentoo
1 commit: 4cd20ef753adcbf7fae65db20d028c90b7e459bc
2 Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
3 AuthorDate: Wed Jul 14 09:05:03 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 16 11:46:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd20ef7
7
8 app-crypt/aescrypt: fix LDFLAGS in Makefile
9
10 Closes: https://bugs.gentoo.org/763660
11 Package-Manager: Portage-3.0.20, Repoman-3.0.2
12 Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
13 Closes: https://github.com/gentoo/gentoo/pull/21633
14 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
15
16 app-crypt/aescrypt/aescrypt-3.14.ebuild | 5 ++++-
17 app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch | 20 ++++++++++++++++++++
18 2 files changed, 24 insertions(+), 1 deletion(-)
19
20 diff --git a/app-crypt/aescrypt/aescrypt-3.14.ebuild b/app-crypt/aescrypt/aescrypt-3.14.ebuild
21 index c40e124664a..51a5d8403d1 100644
22 --- a/app-crypt/aescrypt/aescrypt-3.14.ebuild
23 +++ b/app-crypt/aescrypt/aescrypt-3.14.ebuild
24 @@ -18,7 +18,10 @@ RDEPEND="X? (
25 )
26 "
27
28 -PATCHES=( "${FILESDIR}/${P}-iconv.patch" )
29 +PATCHES=(
30 + "${FILESDIR}/${P}-iconv.patch"
31 + "${FILESDIR}/${P}-ldflags.patch"
32 +)
33
34 src_prepare() {
35 xdg_src_prepare
36
37 diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch b/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
38 new file mode 100644
39 index 00000000000..757f0e4e7fc
40 --- /dev/null
41 +++ b/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
42 @@ -0,0 +1,20 @@
43 +diff -Naru a/src/Makefile b/src/Makefile
44 +--- a/src/Makefile 2021-07-14 09:25:15.509797042 +0200
45 ++++ b/src/Makefile 2021-07-14 09:25:46.689797121 +0200
46 +@@ -27,13 +27,13 @@
47 + all: aescrypt aescrypt_keygen
48 +
49 + aescrypt: $(AESCRYPT_OBJS)
50 +- $(CC) $(CFLAGS) $(LIBS) -o $@ $(AESCRYPT_OBJS)
51 ++ $(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(AESCRYPT_OBJS)
52 +
53 + aescrypt_keygen: $(KEYGEN_OBJS)
54 +- $(CC) $(CFLAGS) $(LIBS) -o $@ $(KEYGEN_OBJS)
55 ++ $(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(KEYGEN_OBJS)
56 +
57 + %.o: %.c %.h
58 +- $(CC) $(CFLAGS) -c $*.c
59 ++ $(CC) $(CFLAGS) $(LDFLAGS) -c $*.c
60 +
61 + install: aescrypt
62 + install -o root -g root -m 755 aescrypt /usr/bin