Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/wdm/files/, x11-misc/wdm/
Date: Thu, 17 Jan 2019 12:28:19
Message-Id: 1547728090.2defd4db4843cdace6f75c6c641ff8577c07d1c0.jer@gentoo
1 commit: 2defd4db4843cdace6f75c6c641ff8577c07d1c0
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 17 12:28:03 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 17 12:28:10 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2defd4db
7
8 x11-misc/wdm: Add missing patch for AR
9
10 Package-Manager: Portage-2.3.56, Repoman-2.3.12
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 x11-misc/wdm/files/wdm-1.28-ar.patch | 20 ++++++++++++++++++++
14 x11-misc/wdm/wdm-1.28-r5.ebuild | 1 +
15 2 files changed, 21 insertions(+)
16
17 diff --git a/x11-misc/wdm/files/wdm-1.28-ar.patch b/x11-misc/wdm/files/wdm-1.28-ar.patch
18 new file mode 100644
19 index 00000000000..f4783061b1c
20 --- /dev/null
21 +++ b/x11-misc/wdm/files/wdm-1.28-ar.patch
22 @@ -0,0 +1,20 @@
23 +--- a/Makefile.in
24 ++++ b/Makefile.in
25 +@@ -26,7 +26,7 @@
26 + xgettext = @XGETTEXT@
27 + msgfmt = @MSGFMT@
28 + ranlib = @RANLIB@
29 +-ar = ar
30 ++AR ?= ar
31 +
32 + cc = $(CC)
33 + cflags = $(CPPFLAGS) $(CFLAGS) $(DEFS) -I./include
34 +@@ -249,7 +249,7 @@
35 +
36 + bin/libwdm.a: src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
37 + mkdir -p bin
38 +- $(ar) cru bin/libwdm.a src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
39 ++ $(AR) cru bin/libwdm.a src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
40 + $(ranlib) bin/libwdm.a
41 +
42 + $(DESTDIR)$(MANDIR)/man1/wdmLogin.1: doc/wdmLogin.man
43
44 diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r5.ebuild
45 index a5fe21ae25c..9a7b26373b7 100644
46 --- a/x11-misc/wdm/wdm-1.28-r5.ebuild
47 +++ b/x11-misc/wdm/wdm-1.28-r5.ebuild
48 @@ -34,6 +34,7 @@ PATCHES=(
49 "${FILESDIR}"/${P}-terminateServer.patch
50 "${FILESDIR}"/${P}-remove-fakehome.patch
51 "${FILESDIR}"/${P}-pkg_config.patch
52 + "${FILESDIR}"/${P}-ar.patch
53 )
54
55 src_prepare() {