diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0018-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0018-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0018-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch b/meta/recipes-core/glibc/glibc/0018-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch new file mode 100644 index 0000000000..c81f82f433 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0018-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 7a25d4796411f22f824742092a4c2a08df99752d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 18 Mar 2015 00:27:10 +0000 | ||
4 | Subject: [PATCH] sysdeps/gnu/configure.ac: Set libc_cv_rootsbindir only if its | ||
5 | empty | ||
6 | |||
7 | This ensures that it can be set in build environment | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | sysdeps/gnu/configure | 2 +- | ||
14 | sysdeps/gnu/configure.ac | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure | ||
18 | index 18c9d7945a..ef22cc845d 100644 | ||
19 | --- a/sysdeps/gnu/configure | ||
20 | +++ b/sysdeps/gnu/configure | ||
21 | @@ -32,7 +32,7 @@ case "$prefix" in | ||
22 | else | ||
23 | libc_cv_localstatedir=$localstatedir | ||
24 | fi | ||
25 | - libc_cv_rootsbindir=/sbin | ||
26 | + libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin} | ||
27 | ;; | ||
28 | esac | ||
29 | |||
30 | diff --git a/sysdeps/gnu/configure.ac b/sysdeps/gnu/configure.ac | ||
31 | index 634fe4de2a..492112e0fd 100644 | ||
32 | --- a/sysdeps/gnu/configure.ac | ||
33 | +++ b/sysdeps/gnu/configure.ac | ||
34 | @@ -21,6 +21,6 @@ case "$prefix" in | ||
35 | else | ||
36 | libc_cv_localstatedir=$localstatedir | ||
37 | fi | ||
38 | - libc_cv_rootsbindir=/sbin | ||
39 | + libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin} | ||
40 | ;; | ||
41 | esac | ||