From 57109e59abb7c6af029f452d06b46f47084cff11 Mon Sep 17 00:00:00 2001 From: Petter Mabäcker Date: Mon, 12 May 2014 15:55:38 +0200 Subject: eglibc: remove usage of FILESPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. Instead FILESEXTRAPATHS should be used to extend the path. If possible try to use any of the default FILESPATH dirs. Also remove superfluous comment and do minor indentation fix. Signed-off-by: Petter Mabäcker Signed-off-by: Richard Purdie --- .../fix_for_centos_5.8.patch | 18 ++++++++++++++++++ .../recipes-core/eglibc/cross-localedef-native_2.19.bb | 3 +-- .../eglibc/eglibc-2.19/fix_for_centos_5.8.patch | 18 ------------------ meta/recipes-core/eglibc/eglibc_2.19.bb | 4 +--- meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb | 2 +- 5 files changed, 21 insertions(+), 24 deletions(-) create mode 100644 meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch delete mode 100644 meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch diff --git a/meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch b/meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch new file mode 100644 index 0000000000..7618c99534 --- /dev/null +++ b/meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch @@ -0,0 +1,18 @@ +Upstream-Status: Inappropriate [other] + +This is a hack to fix building the locale bits on an older +CentOs 5.X machine + +Index: eglibc-2_16/libc/locale/programs/config.h +=================================================================== +--- eglibc-2_16.orig/libc/locale/programs/config.h ++++ eglibc-2_16/libc/locale/programs/config.h +@@ -19,6 +19,8 @@ + #ifndef _LD_CONFIG_H + #define _LD_CONFIG_H 1 + ++#define DUMMY_LOCALE_T ++ + /* Use the internal textdomain used for libc messages. */ + #define PACKAGE _libc_intl_domainname + #ifndef VERSION diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb index 3ce0e1d394..1c13eb824a 100644 --- a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb +++ b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb @@ -13,8 +13,7 @@ LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b inherit native inherit autotools -# pick up an eglibc patch -FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/${P}:" SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2 \ file://fix_for_centos_5.8.patch;patchdir=.. \ diff --git a/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch b/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch deleted file mode 100644 index 7618c99534..0000000000 --- a/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Inappropriate [other] - -This is a hack to fix building the locale bits on an older -CentOs 5.X machine - -Index: eglibc-2_16/libc/locale/programs/config.h -=================================================================== ---- eglibc-2_16.orig/libc/locale/programs/config.h -+++ eglibc-2_16/libc/locale/programs/config.h -@@ -19,6 +19,8 @@ - #ifndef _LD_CONFIG_H - #define _LD_CONFIG_H 1 - -+#define DUMMY_LOCALE_T -+ - /* Use the internal textdomain used for libc messages. */ - #define PACKAGE _libc_intl_domainname - #ifndef VERSION diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb b/meta/recipes-core/eglibc/eglibc_2.19.bb index 8f096769ee..1ddce8224a 100644 --- a/meta/recipes-core/eglibc/eglibc_2.19.bb +++ b/meta/recipes-core/eglibc/eglibc_2.19.bb @@ -24,7 +24,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25 file://0001-R_ARM_TLS_DTPOFF32.patch \ file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ file://fix-tibetian-locales.patch \ - file://ppce6500-32b_slow_ieee754_sqrt.patch \ + file://ppce6500-32b_slow_ieee754_sqrt.patch \ " SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd" SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c" @@ -49,8 +49,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - # # For now, we will skip building of a gcc package if it is a uclibc one # and our build is not a uclibc one, and we skip a glibc one if our build 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 75ffbf615a..7c3463589b 100644 --- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb +++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb @@ -16,7 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \ PR = "r2" -FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}/" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/${P}:" inherit native -- cgit 1.2.3-korg