summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-01-17 13:28:03 +0100
committerJeroen Roovers <jer@gentoo.org>2019-01-17 13:28:10 +0100
commit2defd4db4843cdace6f75c6c641ff8577c07d1c0 (patch)
treef32ad2d7b1f3801b5e7f454c6d185f0b89cdace0
parentx11-misc/wdm: Use pkg-config instead of get-wings-flags (diff)
downloadgentoo-2defd4db4843cdace6f75c6c641ff8577c07d1c0.tar.gz
gentoo-2defd4db4843cdace6f75c6c641ff8577c07d1c0.tar.bz2
gentoo-2defd4db4843cdace6f75c6c641ff8577c07d1c0.zip
x11-misc/wdm: Add missing patch for AR
Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-rw-r--r--x11-misc/wdm/files/wdm-1.28-ar.patch20
-rw-r--r--x11-misc/wdm/wdm-1.28-r5.ebuild1
2 files changed, 21 insertions, 0 deletions
diff --git a/x11-misc/wdm/files/wdm-1.28-ar.patch b/x11-misc/wdm/files/wdm-1.28-ar.patch
new file mode 100644
index 000000000000..f4783061b1ca
--- /dev/null
+++ b/x11-misc/wdm/files/wdm-1.28-ar.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -26,7 +26,7 @@
+ xgettext = @XGETTEXT@
+ msgfmt = @MSGFMT@
+ ranlib = @RANLIB@
+-ar = ar
++AR ?= ar
+
+ cc = $(CC)
+ cflags = $(CPPFLAGS) $(CFLAGS) $(DEFS) -I./include
+@@ -249,7 +249,7 @@
+
+ bin/libwdm.a: src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
+ mkdir -p bin
+- $(ar) cru bin/libwdm.a src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
++ $(AR) cru bin/libwdm.a src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
+ $(ranlib) bin/libwdm.a
+
+ $(DESTDIR)$(MANDIR)/man1/wdmLogin.1: doc/wdmLogin.man
diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r5.ebuild
index a5fe21ae25cb..9a7b26373b7c 100644
--- a/x11-misc/wdm/wdm-1.28-r5.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r5.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
"${FILESDIR}"/${P}-terminateServer.patch
"${FILESDIR}"/${P}-remove-fakehome.patch
"${FILESDIR}"/${P}-pkg_config.patch
+ "${FILESDIR}"/${P}-ar.patch
)
src_prepare() {