[OE-core] [PATCH V2] ldconfig-native: also default to lib32 and lib64 directories

[Nick D'Ademo]

This patch actually breaks my MULTILIB build (Intel NUC platform).
I'll try and get some more details.


On Mon, May 5, 2014 at 12:30 PM, Ming Liu <ming.liu at windriver.com> wrote:

> make ldconfig default to /lib+/usr/lib, /lib32+/usr/lib32 and
> /lib64+/usr/lib64 on bi-ABI architectures.
>
> Signed-off-by: Ming Liu <ming.liu at windriver.com>
> ---
>  .../ldconfig-default-to-all-multilib-dirs.patch    | 37
> ++++++++++++++++++++++
>  meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |  4 ++-
>  2 files changed, 40 insertions(+), 1 deletion(-)
>  create mode 100644
> meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
>
> diff --git
> a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
> b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
> new file mode 100644
> index 0000000..5ed4f6f
> --- /dev/null
> +++
> b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
> @@ -0,0 +1,37 @@
> +Upstream-Status: Inappropriate [embedded specific]
> +
> +make ldconfig default to both /lib+/usr/lib, /lib32+/usr/lib32 and
> +/lib64+/usr/lib64 on bi-ABI architectures.
> +
> +---
> + ldconfig.c |   10 ++++++++++
> + 1 file changed, 10 insertions(+)
> +
> +diff -urpN a/ldconfig.c b/ldconfig.c
> +--- a/ldconfig.c
> ++++ b/ldconfig.c
> +@@ -52,7 +52,11 @@
> +
> + #define SYSCONFDIR "/etc"
> + #define LIBDIR "/usr/lib"
> ++#define LIBDIR32 "/usr/lib32"
> ++#define LIBDIR64 "/usr/lib64"
> + #define SLIBDIR "/lib"
> ++#define SLIBDIR32 "/lib32"
> ++#define SLIBDIR64 "/lib64"
> + # define N_(msgid)  msgid
> + #define _(msg) msg
> +
> +@@ -1373,6 +1377,12 @@ main (int argc, char **argv)
> +       add_system_dir (SLIBDIR);
> +       if (strcmp (SLIBDIR, LIBDIR))
> +       add_system_dir (LIBDIR);
> ++      add_system_dir (SLIBDIR32);
> ++      if (strcmp (SLIBDIR32, LIBDIR32))
> ++      add_system_dir (LIBDIR32);
> ++      add_system_dir (SLIBDIR64);
> ++      if (strcmp (SLIBDIR64, LIBDIR64))
> ++      add_system_dir (LIBDIR64);
> +     }
> +
> +   const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
> diff --git a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bbb/meta/recipes-core/eglibc/
> ldconfig-native_2.12.1.bb
> index d7bc444..75ffbf6 100644
> --- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
> +++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
> @@ -10,7 +10,9 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
>             file://32and64bit.patch \
>             file://endian-ness_handling.patch \
>             file://flag_fix.patch \
> -           file://endianess-header.patch"
> +           file://endianess-header.patch \
> +           file://ldconfig-default-to-all-multilib-dirs.patch \
> +"
>
>  PR = "r2"
>
> --
> 1.8.4.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20140507/54831edb/attachment-0002.html>