From 6f3649de9bb5d0ff45aaa8a4f2e7c7904b6f1a2e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Sep 2014 15:43:33 -0700 Subject: eglibc linaro 2.19: pretend to be named 'glibc' Having an eglibc-initial recipe will keep throwing errors, so let's pretend to be 'glibc' to get rid of those errors. Change-Id: Ic05bea8f41a83ac0fa66d58c8cfc8cae30a9b336 Signed-off-by: Koen Kooi --- .../recipes-core/eglibc/eglibc-initial.inc | 78 ---------- .../eglibc/eglibc-initial_linaro-2.19.bb | 11 -- .../recipes-core/eglibc/eglibc-ld.inc | 6 +- .../eglibc/eglibc-locale_linaro-2.19.bb | 1 - .../eglibc/eglibc-mtrace_linaro-2.19.bb | 1 - .../recipes-core/eglibc/eglibc-options.inc | 78 +++++----- .../recipes-core/eglibc/eglibc-package.inc | 4 +- .../eglibc/eglibc-scripts_linaro-2.19.bb | 1 - .../recipes-core/eglibc/eglibc.inc | 2 +- .../recipes-core/eglibc/eglibc_linaro-2.19.bb | 166 --------------------- .../recipes-core/eglibc/glibc-linaro-2.19 | 1 + .../eglibc/glibc-locale_linaro-2.19.bb | 1 + .../eglibc/glibc-mtrace_linaro-2.19.bb | 1 + .../eglibc/glibc-scripts_linaro-2.19.bb | 1 + .../recipes-core/eglibc/glibc_linaro-2.19.bb | 166 +++++++++++++++++++++ 15 files changed, 215 insertions(+), 303 deletions(-) delete mode 100644 meta-linaro-toolchain/recipes-core/eglibc/eglibc-initial.inc delete mode 100644 meta-linaro-toolchain/recipes-core/eglibc/eglibc-initial_linaro-2.19.bb delete mode 100644 meta-linaro-toolchain/recipes-core/eglibc/eglibc-locale_linaro-2.19.bb delete mode 100644 meta-linaro-toolchain/recipes-core/eglibc/eglibc-mtrace_linaro-2.19.bb delete mode 100644 meta-linaro-toolchain/recipes-core/eglibc/eglibc-scripts_linaro-2.19.bb delete mode 100644 meta-linaro-toolchain/recipes-core/eglibc/eglibc_linaro-2.19.bb create mode 120000 meta-linaro-toolchain/recipes-core/eglibc/glibc-linaro-2.19 create mode 100644 meta-linaro-toolchain/recipes-core/eglibc/glibc-locale_linaro-2.19.bb create mode 100644 meta-linaro-toolchain/recipes-core/eglibc/glibc-mtrace_linaro-2.19.bb create mode 100644 meta-linaro-toolchain/recipes-core/eglibc/glibc-scripts_linaro-2.19.bb create mode 100644 meta-linaro-toolchain/recipes-core/eglibc/glibc_linaro-2.19.bb (limited to 'meta-linaro-toolchain') diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-initial.inc b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-initial.inc deleted file mode 100644 index 92402f8..0000000 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-initial.inc +++ /dev/null @@ -1,78 +0,0 @@ -DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial libgcc-initial" -PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" - -PACKAGES = "" -PACKAGES_DYNAMIC = "" - -STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" - -do_configure () { - sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure - chmod +x ${S}/configure - (cd ${S} && gnu-configize) || die "failure in running gnu-configize" - find ${S} -name "configure" | xargs touch - ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ - --prefix=/usr \ - --without-cvs --disable-sanity-checks \ - --with-headers=${STAGING_DIR_TARGET}${includedir} \ - --with-kconfig=${STAGING_BINDIR_NATIVE} \ - --enable-hacker-mode --enable-addons -} - -do_compile () { - : -} - -do_install () { - oe_runmake cross-compiling=yes install_root=${D} \ - includedir='${includedir}' prefix='${prefix}' \ - install-bootstrap-headers=yes install-headers - - oe_runmake csu/subdir_lib - mkdir -p ${D}${libdir}/ - install -m 644 csu/crt[1in].o ${D}${libdir} - - # Two headers -- stubs.h and features.h -- aren't installed by install-headers, - # so do them by hand. We can tolerate an empty stubs.h for the moment. - # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html - mkdir -p ${D}${includedir}/gnu/ - touch ${D}${includedir}/gnu/stubs.h - cp ${S}/include/features.h ${D}${includedir}/features.h - - if [ -e ${B}/bits/stdio_lim.h ]; then - cp ${B}/bits/stdio_lim.h ${D}${includedir}/bits/ - fi - # add links to linux-libc-headers: final eglibc build need this. - for t in linux asm asm-generic; do - ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/ - done -} - -do_install_locale() { - : -} - -do_siteconfig () { - : -} - -SSTATEPOSTINSTFUNCS += "eglibcinitial_sstate_postinst" -eglibcinitial_sstate_postinst() { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] - then - # Recreate the symlinks to ensure they point to the correct location - for t in linux asm asm-generic; do - rm -f ${STAGING_DIR_TCBOOTSTRAP}${includedir}/$t - ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${STAGING_DIR_TCBOOTSTRAP}${includedir}/ - done - fi -} - -do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/" - -# We don't install any scripts so there is nothing to evacuate -do_evacuate_scripts () { - : -} diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-initial_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-initial_linaro-2.19.bb deleted file mode 100644 index de45079..0000000 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-initial_linaro-2.19.bb +++ /dev/null @@ -1,11 +0,0 @@ -require eglibc_${PV}.bb -require eglibc-initial.inc - -DEPENDS += "kconfig-frontends-native" - -# main eglibc recipes muck with TARGET_CPPFLAGS to point into -# final target sysroot but we -# are not there when building eglibc-initial -# so reset it here - -TARGET_CPPFLAGS = "" diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-ld.inc b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-ld.inc index 6261ae3..962d666 100644 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-ld.inc +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-ld.inc @@ -5,7 +5,7 @@ def ld_append_if_tune_exists(d, infos, dict): infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }') infos['lddrewrite'].add(libdir+'/'+dict[tune][0]) -def eglibc_dl_info(d): +def glibc_dl_info(d): ld_info_all = { "mips": ["ld.so.1", "FLAG_ELF_LIBC6"], "mips64-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], @@ -52,5 +52,5 @@ def eglibc_dl_info(d): infos['lddrewrite'] = ' '.join(infos['lddrewrite']) return infos -EGLIBC_KNOWN_INTERPRETER_NAMES = "${@eglibc_dl_info(d)['ldconfig']}" -RTLDLIST = "${@eglibc_dl_info(d)['lddrewrite']}" +EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}" +RTLDLIST = "${@glibc_dl_info(d)['lddrewrite']}" diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-locale_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-locale_linaro-2.19.bb deleted file mode 100644 index ce6c1d2..0000000 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-locale_linaro-2.19.bb +++ /dev/null @@ -1 +0,0 @@ -require eglibc-locale.inc diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-mtrace_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-mtrace_linaro-2.19.bb deleted file mode 100644 index 6fa2be9..0000000 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-mtrace_linaro-2.19.bb +++ /dev/null @@ -1 +0,0 @@ -require eglibc-mtrace.inc diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-options.inc b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-options.inc index 259e752..ec174d1 100644 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-options.inc +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-options.inc @@ -1,4 +1,4 @@ -def eglibc_cfg(feature, tokens, cnf): +def glibc_cfg(feature, tokens, cnf): if type(tokens) == type(""): tokens = [tokens] if feature: @@ -11,7 +11,7 @@ def eglibc_cfg(feature, tokens, cnf): cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS=\"${S}/nss/fixed-nsswitch.functions\""]) # Map distro features to eglibc options settings -def features_to_eglibc_settings(d): +def features_to_glibc_settings(d): cnf = ([]) ipv4 = bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d) @@ -121,42 +121,42 @@ def features_to_eglibc_settings(d): new_dep = True libc_posix_clang_wchar = True - eglibc_cfg(ipv6, 'OPTION_EGLIBC_ADVANCED_INET6', cnf) - eglibc_cfg(libc_backtrace, 'OPTION_EGLIBC_BACKTRACE', cnf) - eglibc_cfg(libc_big_macros, 'OPTION_EGLIBC_BIG_MACROS', cnf) - eglibc_cfg(libc_bsd, 'OPTION_EGLIBC_BSD', cnf) - eglibc_cfg(libc_cxx_tests, 'OPTION_EGLIBC_CXX_TESTS', cnf) - eglibc_cfg(libc_catgets, 'OPTION_EGLIBC_CATGETS', cnf) - eglibc_cfg(libc_charsets, 'OPTION_EGLIBC_CHARSETS', cnf) - eglibc_cfg(libc_crypt, 'OPTION_EGLIBC_CRYPT', cnf) - eglibc_cfg(libc_crypt_ufc, 'OPTION_EGLIBC_CRYPT_UFC', cnf) - eglibc_cfg(libc_db_aliases, 'OPTION_EGLIBC_DB_ALIASES', cnf) - eglibc_cfg(libc_envz, 'OPTION_EGLIBC_ENVZ', cnf) - eglibc_cfg(libc_fcvt, 'OPTION_EGLIBC_FCVT', cnf) - eglibc_cfg(libc_fmtmsg, 'OPTION_EGLIBC_FMTMSG', cnf) - eglibc_cfg(libc_fstab, 'OPTION_EGLIBC_FSTAB', cnf) - eglibc_cfg(libc_ftraverse, 'OPTION_EGLIBC_FTRAVERSE', cnf) - eglibc_cfg(libc_getlogin, 'OPTION_EGLIBC_GETLOGIN', cnf) - eglibc_cfg(libc_idn, 'OPTION_EGLIBC_IDN', cnf) - eglibc_cfg(ipv4, 'OPTION_EGLIBC_INET', cnf) - eglibc_cfg(libc_inet_anl, 'OPTION_EGLIBC_INET_ANL', cnf) - eglibc_cfg(libc_libm, 'OPTION_EGLIBC_LIBM', cnf) - eglibc_cfg(libc_locales, 'OPTION_EGLIBC_LOCALES', cnf) - eglibc_cfg(libc_locale_code, 'OPTION_EGLIBC_LOCALE_CODE', cnf) - eglibc_cfg(libc_memusage, 'OPTION_EGLIBC_MEMUSAGE', cnf) - eglibc_cfg(libc_nis, 'OPTION_EGLIBC_NIS', cnf) - eglibc_cfg(libc_nsswitch, 'OPTION_EGLIBC_NSSWITCH', cnf) - eglibc_cfg(libc_rcmd, 'OPTION_EGLIBC_RCMD', cnf) - eglibc_cfg(libc_rtld_debug, 'OPTION_EGLIBC_RTLD_DEBUG', cnf) - eglibc_cfg(libc_spawn, 'OPTION_EGLIBC_SPAWN', cnf) - eglibc_cfg(libc_streams, 'OPTION_EGLIBC_STREAMS', cnf) - eglibc_cfg(libc_sunrpc, 'OPTION_EGLIBC_SUNRPC', cnf) - eglibc_cfg(libc_utmp, 'OPTION_EGLIBC_UTMP', cnf) - eglibc_cfg(libc_utmpx, 'OPTION_EGLIBC_UTMPX', cnf) - eglibc_cfg(libc_wordexp, 'OPTION_EGLIBC_WORDEXP', cnf) - eglibc_cfg(libc_posix_clang_wchar, 'OPTION_POSIX_C_LANG_WIDE_CHAR', cnf) - eglibc_cfg(libc_posix_regexp, 'OPTION_POSIX_REGEXP', cnf) - eglibc_cfg(libc_posix_regexp_glibc, 'OPTION_POSIX_REGEXP_GLIBC', cnf) - eglibc_cfg(libc_posix_wchar_io, 'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf) + glibc_cfg(ipv6, 'OPTION_EGLIBC_ADVANCED_INET6', cnf) + glibc_cfg(libc_backtrace, 'OPTION_EGLIBC_BACKTRACE', cnf) + glibc_cfg(libc_big_macros, 'OPTION_EGLIBC_BIG_MACROS', cnf) + glibc_cfg(libc_bsd, 'OPTION_EGLIBC_BSD', cnf) + glibc_cfg(libc_cxx_tests, 'OPTION_EGLIBC_CXX_TESTS', cnf) + glibc_cfg(libc_catgets, 'OPTION_EGLIBC_CATGETS', cnf) + glibc_cfg(libc_charsets, 'OPTION_EGLIBC_CHARSETS', cnf) + glibc_cfg(libc_crypt, 'OPTION_EGLIBC_CRYPT', cnf) + glibc_cfg(libc_crypt_ufc, 'OPTION_EGLIBC_CRYPT_UFC', cnf) + glibc_cfg(libc_db_aliases, 'OPTION_EGLIBC_DB_ALIASES', cnf) + glibc_cfg(libc_envz, 'OPTION_EGLIBC_ENVZ', cnf) + glibc_cfg(libc_fcvt, 'OPTION_EGLIBC_FCVT', cnf) + glibc_cfg(libc_fmtmsg, 'OPTION_EGLIBC_FMTMSG', cnf) + glibc_cfg(libc_fstab, 'OPTION_EGLIBC_FSTAB', cnf) + glibc_cfg(libc_ftraverse, 'OPTION_EGLIBC_FTRAVERSE', cnf) + glibc_cfg(libc_getlogin, 'OPTION_EGLIBC_GETLOGIN', cnf) + glibc_cfg(libc_idn, 'OPTION_EGLIBC_IDN', cnf) + glibc_cfg(ipv4, 'OPTION_EGLIBC_INET', cnf) + glibc_cfg(libc_inet_anl, 'OPTION_EGLIBC_INET_ANL', cnf) + glibc_cfg(libc_libm, 'OPTION_EGLIBC_LIBM', cnf) + glibc_cfg(libc_locales, 'OPTION_EGLIBC_LOCALES', cnf) + glibc_cfg(libc_locale_code, 'OPTION_EGLIBC_LOCALE_CODE', cnf) + glibc_cfg(libc_memusage, 'OPTION_EGLIBC_MEMUSAGE', cnf) + glibc_cfg(libc_nis, 'OPTION_EGLIBC_NIS', cnf) + glibc_cfg(libc_nsswitch, 'OPTION_EGLIBC_NSSWITCH', cnf) + glibc_cfg(libc_rcmd, 'OPTION_EGLIBC_RCMD', cnf) + glibc_cfg(libc_rtld_debug, 'OPTION_EGLIBC_RTLD_DEBUG', cnf) + glibc_cfg(libc_spawn, 'OPTION_EGLIBC_SPAWN', cnf) + glibc_cfg(libc_streams, 'OPTION_EGLIBC_STREAMS', cnf) + glibc_cfg(libc_sunrpc, 'OPTION_EGLIBC_SUNRPC', cnf) + glibc_cfg(libc_utmp, 'OPTION_EGLIBC_UTMP', cnf) + glibc_cfg(libc_utmpx, 'OPTION_EGLIBC_UTMPX', cnf) + glibc_cfg(libc_wordexp, 'OPTION_EGLIBC_WORDEXP', cnf) + glibc_cfg(libc_posix_clang_wchar, 'OPTION_POSIX_C_LANG_WIDE_CHAR', cnf) + glibc_cfg(libc_posix_regexp, 'OPTION_POSIX_REGEXP', cnf) + glibc_cfg(libc_posix_regexp_glibc, 'OPTION_POSIX_REGEXP_GLIBC', cnf) + glibc_cfg(libc_posix_wchar_io, 'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf) return "\n".join(cnf) diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-package.inc b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-package.inc index 2a91fa6..d4a42eb 100644 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-package.inc +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-package.inc @@ -141,9 +141,9 @@ do_evacuate_scripts () { addtask evacuate_scripts after do_install before do_populate_sysroot do_package -PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess" +PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess" -eglibc_package_preprocess () { +glibc_package_preprocess () { rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} rm -rf ${PKGD}/${includedir}/eglibc-scripts-internal-${MULTIMACH_TARGET_SYS} for i in ${bashscripts}; do diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-scripts_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-scripts_linaro-2.19.bb deleted file mode 100644 index 3113362..0000000 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-scripts_linaro-2.19.bb +++ /dev/null @@ -1 +0,0 @@ -require eglibc-scripts.inc diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc.inc b/meta-linaro-toolchain/recipes-core/eglibc/eglibc.inc index af7f6ad..08ae50a 100644 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc.inc +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc.inc @@ -75,7 +75,7 @@ PARALLEL_MAKE = "" # ensure make uses /bin/bash EXTRA_OEMAKE += "SHELL=/bin/bash" -OE_FEATURES = "${@features_to_eglibc_settings(d)}" +OE_FEATURES = "${@features_to_glibc_settings(d)}" do_configure_prepend() { sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in echo '${OE_FEATURES}' > ${B}/option-groups.config diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/eglibc_linaro-2.19.bb deleted file mode 100644 index c5616dc..0000000 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc_linaro-2.19.bb +++ /dev/null @@ -1,166 +0,0 @@ -require recipes-core/eglibc/eglibc.inc - -DEPENDS += "gperf-native kconfig-frontends-native" - -MMYY = "14.08" -RELEASE = "20${MMYY}" -PR = "r${RELEASE}" - -SRC_URI = "http://cbuild.validation.linaro.org/snapshots/eglibc-${PV}-${RELEASE}.tar.bz2 \ - file://eglibc-svn-arm-lowlevellock-include-tls.patch \ - file://IO-acquire-lock-fix.patch \ - file://mips-rld-map-check.patch \ - file://etc/ld.so.conf \ - file://generate-supported.mk \ - file://glibc.fix_sqrt2.patch \ - file://multilib_readlib.patch \ - file://ppc-sqrt_finite.patch \ - file://GLRO_dl_debug_mask.patch \ - file://initgroups_keys.patch \ - file://eglibc_fix_findidx_parameters.patch \ - file://ppc_slow_ieee754_sqrt.patch \ - file://fileops-without-wchar-io.patch \ - file://add_resource_h_to_wait_h.patch \ - file://0001-eglibc-menuconfig-support.patch \ - file://0002-eglibc-menuconfig-hex-string-options.patch \ - file://0003-eglibc-menuconfig-build-instructions.patch \ - file://fsl-ppc-no-fsqrt.patch \ - 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://grok_gold.patch \ - file://fix_am_rootsbindir.patch;striplevel=2 \ - file://timezone-re-written-tzselect-as-posix-sh.patch \ - " - -SRC_URI[md5sum] = "f4f66db3745273367d9f2901d449e3f4" -SRC_URI[sha256sum] = "d792b859c356d99a49b94042cb7aa71758b840173d85286d5e66d994ce036384" - -LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI_append_class-nativesdk = " file://ld-search-order.patch \ - file://relocatable_sdk.patch \ - file://relocatable_sdk_fix_openpath.patch \ - " -S = "${WORKDIR}/eglibc-${PV}-${RELEASE}" -B = "${WORKDIR}/build-${TARGET_SYS}" - -PACKAGES_DYNAMIC = "" - -# the -isystem in bitbake.conf screws up glibc do_stage -BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" -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 -# is a uclibc build. -# -# See the note in gcc/gcc_3.4.0.oe -# - -python __anonymous () { - import re - uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) - if uc_os: - raise bb.parse.SkipPackage("incompatible with target %s" % - d.getVar('TARGET_OS', True)) -} - -export libc_cv_slibdir = "${base_libdir}" - -EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ - --without-cvs --disable-profile \ - --disable-debug --without-gd \ - --enable-clocale=gnu \ - --enable-add-ons \ - --with-headers=${STAGING_INCDIR} \ - --without-selinux \ - --enable-obsolete-rpc \ - --with-kconfig=${STAGING_BINDIR_NATIVE} \ - ${GLIBC_EXTRA_OECONF}" - -EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" - -do_patch_append() { - bb.build.exec_func('do_fix_readlib_c', d) -} - -# for mips eglibc now builds syscall tables for all abi's -# so we make sure that we choose right march option which is -# compatible with o32,n32 and n64 abi's -# e.g. -march=mips32 is not compatible with n32 and n64 therefore -# we filter it out in such case -march=from-abi which will be -# mips1 when using o32 and mips3 when using n32/n64 - -TUNE_CCARGS_mips := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}" -TUNE_CCARGS_mipsel := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}" - -do_fix_readlib_c () { - sed -i -e 's#OECORE_KNOWN_INTERPRETER_NAMES#${EGLIBC_KNOWN_INTERPRETER_NAMES}#' ${S}/elf/readlib.c -} - -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now -# don't pass CPPFLAGS into configure, since it upsets the kernel-headers -# version check and doesn't really help with anything - if [ -z "`which rpcgen`" ]; then - echo "rpcgen not found. Install glibc-devel." - exit 1 - fi - (cd ${S} && gnu-configize) || die "failure in running gnu-configize" - find ${S} -name "configure" | xargs touch - CPPFLAGS="" oe_runconf -} - -rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ - yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ - rusers.x spray.x nfs_prot.x rquota.x key_prot.x" - -do_compile () { - # -Wl,-rpath-link /lib in LDFLAGS can cause breakage if another glibc is in staging - unset LDFLAGS - base_do_compile - ( - cd ${S}/sunrpc/rpcsvc - for r in ${rpcsvc}; do - h=`echo $r|sed -e's,\.x$,.h,'` - rpcgen -h $r -o $h || bbwarn "unable to generate header for $r" - done - ) - echo "Adjust ldd script" - if [ -n "${RTLDLIST}" ] - then - prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST="\?\([^"]*\)"\?$#\1#'` - if [ "${prevrtld}" != "${RTLDLIST}" ] - then - sed -i ${B}/elf/ldd -e "s#^RTLDLIST=.*\$#RTLDLIST=\"${prevrtld} ${RTLDLIST}\"#" - fi - fi - -} - -# In case of aarch64_be install symlink to ld-linux-aarch64_be.so.1 -# to enable transition of toolchain and executables that are not yet -# aware about aarch64_be run-time linker name change. -# -# Currently there is no use case that requires both LE and BE eglibc -# installed into the same rootfs, so our transitional symlink should -# be fine. -# -do_install_append_aarch64-be() { - ln -sf ld-linux-aarch64_be.so.1 ${D}${base_libdir}/ld-linux-aarch64.so.1 -} - -require recipes-core/eglibc/eglibc-package.inc - -BBCLASSEXTEND = "nativesdk" diff --git a/meta-linaro-toolchain/recipes-core/eglibc/glibc-linaro-2.19 b/meta-linaro-toolchain/recipes-core/eglibc/glibc-linaro-2.19 new file mode 120000 index 0000000..2ebd730 --- /dev/null +++ b/meta-linaro-toolchain/recipes-core/eglibc/glibc-linaro-2.19 @@ -0,0 +1 @@ +eglibc-linaro-2.19/ \ No newline at end of file diff --git a/meta-linaro-toolchain/recipes-core/eglibc/glibc-locale_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/glibc-locale_linaro-2.19.bb new file mode 100644 index 0000000..ce6c1d2 --- /dev/null +++ b/meta-linaro-toolchain/recipes-core/eglibc/glibc-locale_linaro-2.19.bb @@ -0,0 +1 @@ +require eglibc-locale.inc diff --git a/meta-linaro-toolchain/recipes-core/eglibc/glibc-mtrace_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/glibc-mtrace_linaro-2.19.bb new file mode 100644 index 0000000..6fa2be9 --- /dev/null +++ b/meta-linaro-toolchain/recipes-core/eglibc/glibc-mtrace_linaro-2.19.bb @@ -0,0 +1 @@ +require eglibc-mtrace.inc diff --git a/meta-linaro-toolchain/recipes-core/eglibc/glibc-scripts_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/glibc-scripts_linaro-2.19.bb new file mode 100644 index 0000000..3113362 --- /dev/null +++ b/meta-linaro-toolchain/recipes-core/eglibc/glibc-scripts_linaro-2.19.bb @@ -0,0 +1 @@ +require eglibc-scripts.inc diff --git a/meta-linaro-toolchain/recipes-core/eglibc/glibc_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/glibc_linaro-2.19.bb new file mode 100644 index 0000000..c5616dc --- /dev/null +++ b/meta-linaro-toolchain/recipes-core/eglibc/glibc_linaro-2.19.bb @@ -0,0 +1,166 @@ +require recipes-core/eglibc/eglibc.inc + +DEPENDS += "gperf-native kconfig-frontends-native" + +MMYY = "14.08" +RELEASE = "20${MMYY}" +PR = "r${RELEASE}" + +SRC_URI = "http://cbuild.validation.linaro.org/snapshots/eglibc-${PV}-${RELEASE}.tar.bz2 \ + file://eglibc-svn-arm-lowlevellock-include-tls.patch \ + file://IO-acquire-lock-fix.patch \ + file://mips-rld-map-check.patch \ + file://etc/ld.so.conf \ + file://generate-supported.mk \ + file://glibc.fix_sqrt2.patch \ + file://multilib_readlib.patch \ + file://ppc-sqrt_finite.patch \ + file://GLRO_dl_debug_mask.patch \ + file://initgroups_keys.patch \ + file://eglibc_fix_findidx_parameters.patch \ + file://ppc_slow_ieee754_sqrt.patch \ + file://fileops-without-wchar-io.patch \ + file://add_resource_h_to_wait_h.patch \ + file://0001-eglibc-menuconfig-support.patch \ + file://0002-eglibc-menuconfig-hex-string-options.patch \ + file://0003-eglibc-menuconfig-build-instructions.patch \ + file://fsl-ppc-no-fsqrt.patch \ + 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://grok_gold.patch \ + file://fix_am_rootsbindir.patch;striplevel=2 \ + file://timezone-re-written-tzselect-as-posix-sh.patch \ + " + +SRC_URI[md5sum] = "f4f66db3745273367d9f2901d449e3f4" +SRC_URI[sha256sum] = "d792b859c356d99a49b94042cb7aa71758b840173d85286d5e66d994ce036384" + +LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI_append_class-nativesdk = " file://ld-search-order.patch \ + file://relocatable_sdk.patch \ + file://relocatable_sdk_fix_openpath.patch \ + " +S = "${WORKDIR}/eglibc-${PV}-${RELEASE}" +B = "${WORKDIR}/build-${TARGET_SYS}" + +PACKAGES_DYNAMIC = "" + +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" +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 +# is a uclibc build. +# +# See the note in gcc/gcc_3.4.0.oe +# + +python __anonymous () { + import re + uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + d.getVar('TARGET_OS', True)) +} + +export libc_cv_slibdir = "${base_libdir}" + +EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile \ + --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + --enable-obsolete-rpc \ + --with-kconfig=${STAGING_BINDIR_NATIVE} \ + ${GLIBC_EXTRA_OECONF}" + +EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" + +do_patch_append() { + bb.build.exec_func('do_fix_readlib_c', d) +} + +# for mips eglibc now builds syscall tables for all abi's +# so we make sure that we choose right march option which is +# compatible with o32,n32 and n64 abi's +# e.g. -march=mips32 is not compatible with n32 and n64 therefore +# we filter it out in such case -march=from-abi which will be +# mips1 when using o32 and mips3 when using n32/n64 + +TUNE_CCARGS_mips := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}" +TUNE_CCARGS_mipsel := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}" + +do_fix_readlib_c () { + sed -i -e 's#OECORE_KNOWN_INTERPRETER_NAMES#${EGLIBC_KNOWN_INTERPRETER_NAMES}#' ${S}/elf/readlib.c +} + +do_configure () { +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now +# don't pass CPPFLAGS into configure, since it upsets the kernel-headers +# version check and doesn't really help with anything + if [ -z "`which rpcgen`" ]; then + echo "rpcgen not found. Install glibc-devel." + exit 1 + fi + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + find ${S} -name "configure" | xargs touch + CPPFLAGS="" oe_runconf +} + +rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ + yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ + rusers.x spray.x nfs_prot.x rquota.x key_prot.x" + +do_compile () { + # -Wl,-rpath-link /lib in LDFLAGS can cause breakage if another glibc is in staging + unset LDFLAGS + base_do_compile + ( + cd ${S}/sunrpc/rpcsvc + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + rpcgen -h $r -o $h || bbwarn "unable to generate header for $r" + done + ) + echo "Adjust ldd script" + if [ -n "${RTLDLIST}" ] + then + prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST="\?\([^"]*\)"\?$#\1#'` + if [ "${prevrtld}" != "${RTLDLIST}" ] + then + sed -i ${B}/elf/ldd -e "s#^RTLDLIST=.*\$#RTLDLIST=\"${prevrtld} ${RTLDLIST}\"#" + fi + fi + +} + +# In case of aarch64_be install symlink to ld-linux-aarch64_be.so.1 +# to enable transition of toolchain and executables that are not yet +# aware about aarch64_be run-time linker name change. +# +# Currently there is no use case that requires both LE and BE eglibc +# installed into the same rootfs, so our transitional symlink should +# be fine. +# +do_install_append_aarch64-be() { + ln -sf ld-linux-aarch64_be.so.1 ${D}${base_libdir}/ld-linux-aarch64.so.1 +} + +require recipes-core/eglibc/eglibc-package.inc + +BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3