* [PATCH] ldconfig-native: default to both lib and lib64 directories
@ 2014-05-04 9:30 Ming Liu
2014-05-05 1:00 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Ming Liu @ 2014-05-04 9:30 UTC (permalink / raw)
To: openembedded-core
make ldconfig default to both /lib+/usr/lib and /lib64+/usr/lib64
on bi-ABI architectures.
Signed-off-by: Ming Liu <ming.liu@windriver.com>
---
.../ldconfig-default-to-both-lib-and-lib64.patch | 32 ++++++++++++++++++++++
meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb | 4 ++-
2 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch
diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch
new file mode 100644
index 0000000..230502e
--- /dev/null
+++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch
@@ -0,0 +1,32 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+make ldconfig default to both /lib+/usr/lib and /lib64+/usr/lib64
+on bi-ABI architectures.
+
+---
+ ldconfig.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff -urpN a/ldconfig.c b/ldconfig.c
+--- a/ldconfig.c
++++ b/ldconfig.c
+@@ -52,7 +52,9 @@
+
+ #define SYSCONFDIR "/etc"
+ #define LIBDIR "/usr/lib"
++#define LIBDIR64 "/usr/lib64"
+ #define SLIBDIR "/lib"
++#define SLIBDIR64 "/lib64"
+ # define N_(msgid) msgid
+ #define _(msg) msg
+
+@@ -1373,6 +1375,9 @@ main (int argc, char **argv)
+ add_system_dir (SLIBDIR);
+ if (strcmp (SLIBDIR, LIBDIR))
+ add_system_dir (LIBDIR);
++ 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.bb b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
index d7bc444..69748a4 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-both-lib-and-lib64.patch \
+"
PR = "r2"
--
1.8.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ldconfig-native: default to both lib and lib64 directories
2014-05-04 9:30 [PATCH] ldconfig-native: default to both lib and lib64 directories Ming Liu
@ 2014-05-05 1:00 ` Khem Raj
2014-05-05 1:43 ` Ming Liu
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2014-05-05 1:00 UTC (permalink / raw)
To: Ming Liu; +Cc: Patches and discussions about the oe-core layer
On Sun, May 4, 2014 at 2:30 AM, Ming Liu <ming.liu@windriver.com> wrote:
> make ldconfig default to both /lib+/usr/lib and /lib64+/usr/lib64
> on bi-ABI architectures.
There is also lib32 and usr/lib32 version when you have mips. So this
is half solution if you want to solve mutlilib
>
> Signed-off-by: Ming Liu <ming.liu@windriver.com>
> ---
> .../ldconfig-default-to-both-lib-and-lib64.patch | 32 ++++++++++++++++++++++
> meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb | 4 ++-
> 2 files changed, 35 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch
>
> diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch
> new file mode 100644
> index 0000000..230502e
> --- /dev/null
> +++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch
> @@ -0,0 +1,32 @@
> +Upstream-Status: Inappropriate [embedded specific]
> +
> +make ldconfig default to both /lib+/usr/lib and /lib64+/usr/lib64
> +on bi-ABI architectures.
> +
> +---
> + ldconfig.c | 5 +++++
> + 1 file changed, 5 insertions(+)
> +
> +diff -urpN a/ldconfig.c b/ldconfig.c
> +--- a/ldconfig.c
> ++++ b/ldconfig.c
> +@@ -52,7 +52,9 @@
> +
> + #define SYSCONFDIR "/etc"
> + #define LIBDIR "/usr/lib"
> ++#define LIBDIR64 "/usr/lib64"
> + #define SLIBDIR "/lib"
> ++#define SLIBDIR64 "/lib64"
> + # define N_(msgid) msgid
> + #define _(msg) msg
> +
> +@@ -1373,6 +1375,9 @@ main (int argc, char **argv)
> + add_system_dir (SLIBDIR);
> + if (strcmp (SLIBDIR, LIBDIR))
> + add_system_dir (LIBDIR);
> ++ 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.bb b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
> index d7bc444..69748a4 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-both-lib-and-lib64.patch \
> +"
>
> PR = "r2"
>
> --
> 1.8.4.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ldconfig-native: default to both lib and lib64 directories
2014-05-05 1:00 ` Khem Raj
@ 2014-05-05 1:43 ` Ming Liu
0 siblings, 0 replies; 3+ messages in thread
From: Ming Liu @ 2014-05-05 1:43 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On 05/05/2014 09:00 AM, Khem Raj wrote:
> On Sun, May 4, 2014 at 2:30 AM, Ming Liu <ming.liu@windriver.com> wrote:
>> make ldconfig default to both /lib+/usr/lib and /lib64+/usr/lib64
>> on bi-ABI architectures.
> There is also lib32 and usr/lib32 version when you have mips. So this
> is half solution if you want to solve mutlilib
Thanks for the reminder, you are correct, it's not complete, I will send
a V2.
//Ming Liu
>
>> Signed-off-by: Ming Liu <ming.liu@windriver.com>
>> ---
>> .../ldconfig-default-to-both-lib-and-lib64.patch | 32 ++++++++++++++++++++++
>> meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb | 4 ++-
>> 2 files changed, 35 insertions(+), 1 deletion(-)
>> create mode 100644 meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch
>>
>> diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch
>> new file mode 100644
>> index 0000000..230502e
>> --- /dev/null
>> +++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-both-lib-and-lib64.patch
>> @@ -0,0 +1,32 @@
>> +Upstream-Status: Inappropriate [embedded specific]
>> +
>> +make ldconfig default to both /lib+/usr/lib and /lib64+/usr/lib64
>> +on bi-ABI architectures.
>> +
>> +---
>> + ldconfig.c | 5 +++++
>> + 1 file changed, 5 insertions(+)
>> +
>> +diff -urpN a/ldconfig.c b/ldconfig.c
>> +--- a/ldconfig.c
>> ++++ b/ldconfig.c
>> +@@ -52,7 +52,9 @@
>> +
>> + #define SYSCONFDIR "/etc"
>> + #define LIBDIR "/usr/lib"
>> ++#define LIBDIR64 "/usr/lib64"
>> + #define SLIBDIR "/lib"
>> ++#define SLIBDIR64 "/lib64"
>> + # define N_(msgid) msgid
>> + #define _(msg) msg
>> +
>> +@@ -1373,6 +1375,9 @@ main (int argc, char **argv)
>> + add_system_dir (SLIBDIR);
>> + if (strcmp (SLIBDIR, LIBDIR))
>> + add_system_dir (LIBDIR);
>> ++ 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.bb b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
>> index d7bc444..69748a4 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-both-lib-and-lib64.patch \
>> +"
>>
>> PR = "r2"
>>
>> --
>> 1.8.4.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-05 1:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-04 9:30 [PATCH] ldconfig-native: default to both lib and lib64 directories Ming Liu
2014-05-05 1:00 ` Khem Raj
2014-05-05 1:43 ` Ming Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.