summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-08-13 17:38:44 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-08-13 17:38:44 +0000
commit690054f454e6216175501d13e85f4a8dfb099223 (patch)
treea7609eff24827010dfc5e4632b0c462eb1e23098
parentThere was actually open bug for last commit, adjust ChangeLog and add some cr... (diff)
downloadgentoo-2-690054f454e6216175501d13e85f4a8dfb099223.tar.gz
gentoo-2-690054f454e6216175501d13e85f4a8dfb099223.tar.bz2
gentoo-2-690054f454e6216175501d13e85f4a8dfb099223.zip
Tweak -udevdir.patch in a way PKG_CONFIG is read from environment if exported.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
-rw-r--r--sys-fs/mdadm/ChangeLog7
-rw-r--r--sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch2
2 files changed, 7 insertions, 2 deletions
diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index d3235d9ffc37..1348ee5b20b3 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/mdadm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.156 2012/08/12 17:53:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.157 2012/08/13 17:38:44 ssuominen Exp $
+
+ 13 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+ files/mdadm-3.2.x-udevdir.patch:
+ Tweak -udevdir.patch in a way PKG_CONFIG is read from environment if
+ exported.
12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> mdadm-3.2.5-r1.ebuild,
+files/mdadm-3.2.x-udevdir.patch:
diff --git a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
index e6dfce9d7e80..8bfdcd5261ab 100644
--- a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
+++ b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
@@ -6,7 +6,7 @@ http://bugs.gentoo.org/430900
MAN4DIR = $(MANDIR)/man4
MAN5DIR = $(MANDIR)/man5
MAN8DIR = $(MANDIR)/man8
-+PKG_CONFIG = pkg-config
++PKG_CONFIG ?= pkg-config
+
+UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
+ifndef UDEVDIR