From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Greylist: delayed 5816 seconds by postgrey-1.34 at layers.openembedded.org; Sun, 04 May 2014 11:07:32 UTC Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 69E986098B for ; Sun, 4 May 2014 11:07:32 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.5) with ESMTP id s449Ua8h022566 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Sun, 4 May 2014 02:30:36 -0700 (PDT) Received: from PEK-MLIU3-D1.corp.ad.wrs.com (128.224.163.186) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.169.1; Sun, 4 May 2014 02:30:36 -0700 From: Ming Liu To: Date: Sun, 4 May 2014 17:30:33 +0800 Message-ID: <1399195833-4364-1-git-send-email-ming.liu@windriver.com> X-Mailer: git-send-email 1.8.4.1 MIME-Version: 1.0 Subject: [PATCH] ldconfig-native: default to both lib and lib64 directories X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2014 11:07:34 -0000 Content-Type: text/plain make ldconfig default to both /lib+/usr/lib and /lib64+/usr/lib64 on bi-ABI architectures. Signed-off-by: Ming Liu --- .../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