diff options
author | Phil Blundell <philb@gnu.org> | 2012-09-24 07:24:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-24 11:30:31 +0100 |
commit | d3e03abebaa4ce4b20f61143375b207d25a7e1ef (patch) | |
tree | 155373c03624ddea6fba1b939e8c497f148d81bc /meta/recipes-core/util-linux/util-linux | |
parent | 22a4046ab36498f7c7ea3f7518acd2c89f8163c3 (diff) | |
download | poky-d3e03abebaa4ce4b20f61143375b207d25a7e1ef.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.
(From OE-Core rev: 6fdca45ec85e226f570917d2d1aaa2aa39ab6b42)
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.patch | 18 |
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 @@ | |||
1 | util-linux: take ${sbindir} from the environment if it is set there | ||
2 | |||
3 | Signed-off-by: Phil Blundell <pb@pbcl.net> | ||
4 | Upstream-Status: Inappropriate [configuration] | ||
5 | |||
6 | --- util-linux-2.21.2/configure.ac~ 2012-09-22 09:29:12.354215377 +0100 | ||
7 | +++ util-linux-2.21.2/configure.ac 2012-09-22 16:47:14.713628946 +0100 | ||
8 | @@ -67,7 +67,9 @@ | ||
9 | usrbin_execdir='${exec_prefix}/bin' | ||
10 | AC_SUBST([usrbin_execdir]) | ||
11 | |||
12 | -usrsbin_execdir='${exec_prefix}/sbin' | ||
13 | +if [ -z "$usrsbin_execdir" ]; then | ||
14 | + usrsbin_execdir='${exec_prefix}/sbin' | ||
15 | +fi | ||
16 | AC_SUBST([usrsbin_execdir]) | ||
17 | |||
18 | usrlib_execdir='${exec_prefix}/'$libdirname | ||