aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-24 07:24:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-24 11:11:53 +0100
commit6fdca45ec85e226f570917d2d1aaa2aa39ab6b42 (patch)
treee7ca08cde3ea9b181df9eb19cf9912eb17b6b836 /meta/recipes-core/util-linux/util-linux
parente7b82cb4d107bfbfa5c939d406dd6ce6615b24e1 (diff)
downloadopenembedded-core-contrib-6fdca45ec85e226f570917d2d1aaa2aa39ab6b42.tar.gz
util-linux: Ensure that ${sbindir} is respected
The configure script uses a hard-coded value for ${usrsbin_execdir}, which is the path that we know as ${sbindir}. Adjust configure to take this from the environment if it's set there, and have do_configure() pass it in. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux')
-rw-r--r--meta/recipes-core/util-linux/util-linux/configure-sbindir.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
new file mode 100644
index 0000000000..f1f5ef4e4f
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
@@ -0,0 +1,18 @@
+util-linux: take ${sbindir} from the environment if it is set there
+
+Signed-off-by: Phil Blundell <pb@pbcl.net>
+Upstream-Status: Inappropriate [configuration]
+
+--- util-linux-2.21.2/configure.ac~ 2012-09-22 09:29:12.354215377 +0100
++++ util-linux-2.21.2/configure.ac 2012-09-22 16:47:14.713628946 +0100
+@@ -67,7 +67,9 @@
+ usrbin_execdir='${exec_prefix}/bin'
+ AC_SUBST([usrbin_execdir])
+
+-usrsbin_execdir='${exec_prefix}/sbin'
++if [ -z "$usrsbin_execdir" ]; then
++ usrsbin_execdir='${exec_prefix}/sbin'
++fi
+ AC_SUBST([usrsbin_execdir])
+
+ usrlib_execdir='${exec_prefix}/'$libdirname