diff options
Diffstat (limited to 'packages/glibc')
35 files changed, 1555 insertions, 115 deletions
diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb new file mode 100644 index 0000000000..02ba4c6273 --- /dev/null +++ b/packages/glibc/eglibc-initial_svn.bb @@ -0,0 +1,46 @@ +require eglibc_${PV}.bb + +DEPENDS = "linux-libc-headers" +PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +PACKAGES = "" + +do_configure () { + sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure + chmod +x ${S}/configure + unset CFLAGS + CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ + --without-cvs --disable-sanity-checks \ + --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \ + --enable-hacker-mode + if grep -q GLIBC_2.3 ${S}/ChangeLog; then + # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. + # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. + # Another workaround might be to tell configure to not use any cross options to $(CC). + # The real fix would be to get install-headers to not generate errlist-compat.c. + make sysdeps/gnu/errlist.c + mkdir -p stdio-common + touch stdio-common/errlist-compat.c + fi +} + +do_compile () { + : +} + +do_stage () { + oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers + + # 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 ${CROSS_DIR}/${TARGET_SYS}/include/gnu + touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h + cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h +} + +do_install () { + : +} diff --git a/packages/glibc/eglibc-intermediate_svn.bb b/packages/glibc/eglibc-intermediate_svn.bb new file mode 100644 index 0000000000..c26f649031 --- /dev/null +++ b/packages/glibc/eglibc-intermediate_svn.bb @@ -0,0 +1,19 @@ +require eglibc_${PV}.bb + +do_install () { + : +} + +# gcc uses -Werror which break on a "you have no thumb interwork" _warning_ +do_configure_prepend() { + sed -i s:-Werror:: ${S}/configure +} + + + +PACKAGES = "" +PACKAGES_DYNAMIC = "" +PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" +DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" +GLIBC_ADDONS = "nptl,ports" +GLIBC_EXTRA_OECONF = "" diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass new file mode 100644 index 0000000000..0f88227cdf --- /dev/null +++ b/packages/glibc/eglibc-package.bbclass @@ -0,0 +1,319 @@ +# +# 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 eglibc one if our build +# is a uclibc build. +# +# See the note in gcc/gcc_3.4.0.oe +# + +python __anonymous () { + import bb, re + uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + + +# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION +# is set. The idea is to avoid running localedef on the target (at first boot) +# to decrease initial boot time and avoid localedef being killed by the OOM +# killer which used to effectively break i18n on machines with < 128MB RAM. + +# default to disabled until qemu works for everyone +ENABLE_BINARY_LOCALE_GENERATION ?= "0" + +# BINARY_LOCALE_ARCHES is a space separated list of regular expressions +BINARY_LOCALE_ARCHES ?= "arm.*" + +PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" +PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" + +libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" + +FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir}/* ${datadir}/zoneinfo" +FILES_ldd = "${bindir}/ldd" +FILES_libsegfault = "/lib/libSegFault*" +FILES_eglibc-extra-nss = "/lib/libnss*" +FILES_sln = "/sbin/sln" +FILES_eglibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen" +FILES_nscd = "${sbindir}/nscd*" +FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" +FILES_eglibc-gconv = "${libdir}/gconv/*" +FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug" +FILES_catchsegv = "${bindir}/catchsegv" +RDEPENDS_catchsegv = "libsegfault" +FILES_eglibc-pcprofile = "/lib/libpcprofile.so" +FILES_eglibc-thread-db = "/lib/libthread_db*" +FILES_localedef = "${bindir}/localedef" +RPROVIDES_eglibc-dev += "libc-dev" + +DESCRIPTION_sln = "eglibc: create symbolic links between files" +DESCRIPTION_nscd = "eglibc: name service cache daemon for passwd, group, and hosts" +DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services" +DESCRIPTION_ldd = "eglibc: print shared library dependencies" +DESCRIPTION_localedef = "eglibc: compile locale definition files" +DESCRIPTION_eglibc-utils = "eglibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..." + +def get_eglibc_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--without-fp" + return "" + +EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}" + +OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" + +do_install() { + oe_runmake install_root=${D} install + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/ + done + install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ + install -d ${D}${libdir}/locale + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp + mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED + done + rm -f ${D}/etc/rpc +} + +TMP_LOCALE="/tmp/locale${libdir}/locale" + +locale_base_postinst() { +#!/bin/sh + +if [ "x$D" != "x" ]; then + exit 1 +fi + +rm -rf ${TMP_LOCALE} +mkdir -p ${TMP_LOCALE} +if [ -f ${libdir}/locale/locale-archive ]; then + cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ +fi +localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s --prefix=/tmp/locale %s +mkdir -p ${libdir}/locale/ +mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ +rm -rf ${TMP_LOCALE} +} + +locale_base_postrm() { +#!/bin/sh + +rm -rf ${TMP_LOCALE} +mkdir -p ${TMP_LOCALE} +if [ -f ${libdir}/locale/locale-archive ]; then + cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ +fi +localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=%s --prefix=/tmp/locale %s +mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ +rm -rf ${TMP_LOCALE} +} + +python __anonymous () { + enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1) + + if enabled and int(enabled): + import re + + target_arch = bb.data.getVar("TARGET_ARCH", d, 1) + binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or "" + + for regexp in binary_arches.split(" "): + r = re.compile(regexp) + + if r.match(target_arch): + depends = bb.data.getVar("DEPENDS", d, 1) + depends = "%s qemu-native" % depends + bb.data.setVar("DEPENDS", depends, d) + bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d) + break +} + +do_prep_locale_tree() { + treedir=${WORKDIR}/locale-tree + rm -rf $treedir + mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale + cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n + # unzip to avoid parsing errors + for i in $treedir/${datadir}/i18n/charmaps/*gz; do + gunzip $i + done + ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then + cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib + fi + install -m 0755 ${D}${bindir}/localedef $treedir/bin +} + +do_collect_bins_from_locale_tree() { + treedir=${WORKDIR}/locale-tree + + mkdir -p ${D}${libdir} + cp -a $treedir/${libdir}/locale ${D}${libdir} +} + +python package_do_split_gconvs () { + import os, re + if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'): + bb.note("package requested not splitting gconvs") + return + + if not bb.data.getVar('PACKAGES', d, 1): + return + + libdir = bb.data.getVar('libdir', d, 1) + if not libdir: + bb.error("libdir not defined") + return + datadir = bb.data.getVar('datadir', d, 1) + if not datadir: + bb.error("datadir not defined") + return + + gconv_libdir = base_path_join(libdir, "gconv") + charmap_dir = base_path_join(datadir, "i18n", "charmaps") + locales_dir = base_path_join(datadir, "i18n", "locales") + binary_locales_dir = base_path_join(libdir, "locale") + + do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', extra_depends='eglibc-gconv') + + do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', extra_depends='') + + def calc_locale_deps(fn, pkg, file_regex, output_pattern, group): + deps = [] + f = open(fn, "r") + c_re = re.compile('^copy "(.*)"') + i_re = re.compile('^include "(\w+)".*') + for l in f.readlines(): + m = c_re.match(l) or i_re.match(l) + if m: + dp = legitimize_package_name('eglibc-localedata-%s' % m.group(1)) + if not dp in deps: + deps.append(dp) + f.close() + if deps != []: + bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + + do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') + bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d) + + supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1) + if not supported or supported == "all": + f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") + supported = f.readlines() + f.close() + else: + supported = supported.split() + supported = map(lambda s:s.replace(".", " ") + "\n", supported) + + dot_re = re.compile("(.*)\.(.*)") + + # Collate the locales by base and encoding + encodings = {} + for l in supported: + l = l[:-1] + (locale, charset) = l.split(" ") + m = dot_re.match(locale) + if m: + locale = m.group(1) + if not encodings.has_key(locale): + encodings[locale] = [] + encodings[locale].append(charset) + + def output_locale_source(name, locale, encoding): + pkgname = 'locale-base-' + legitimize_package_name(name) + + bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef eglibc-localedata-%s eglibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d) + rprovides = 'virtual-locale-%s' % legitimize_package_name(name) + m = re.match("(.*)_(.*)", name) + if m: + rprovides += ' virtual-locale-%s' % m.group(1) + bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) + bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) + bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) + bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d) + bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d) + + def output_locale_binary(name, locale, encoding): + target_arch = bb.data.getVar("TARGET_ARCH", d, 1) + qemu = "qemu-%s -r 2.6.16" % target_arch + pkgname = 'locale-base-' + legitimize_package_name(name) + m = re.match("(.*)\.(.*)", name) + if m: + eglibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) + else: + eglibc_name = name + bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d) + rprovides = 'virtual-locale-%s' % legitimize_package_name(name) + m = re.match("(.*)_(.*)", name) + if m: + rprovides += ' virtual-locale-%s' % m.group(1) + bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) + bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) + bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) + + treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + path = bb.data.getVar("PATH", d, 1) + i18npath = base_path_join(treedir, datadir, "i18n") + + localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) + bb.note("generating locale %s (%s)" % (locale, encoding)) + if os.system(cmd): + raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) + + def output_locale(name, locale, encoding): + use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) + if use_bin: + output_locale_binary(name, locale, encoding) + else: + output_locale_source(name, locale, encoding) + + use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) + if use_bin: + bb.note("preparing tree for binary locale generation") + bb.build.exec_func("do_prep_locale_tree", d) + + # Reshuffle names so that UTF-8 is preferred over other encodings + non_utf8 = [] + for l in encodings.keys(): + if len(encodings[l]) == 1: + output_locale(l, l, encodings[l][0]) + if encodings[l][0] != "UTF-8": + non_utf8.append(l) + else: + if "UTF-8" in encodings[l]: + output_locale(l, l, "UTF-8") + encodings[l].remove("UTF-8") + else: + non_utf8.append(l) + for e in encodings[l]: + output_locale('%s.%s' % (l, e), l, e) + + if non_utf8 != []: + bb.note("the following locales are supported only in legacy encodings:") + bb.note(" " + " ".join(non_utf8)) + + use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) + if use_bin: + bb.note("collecting binary locales from locale tree") + bb.build.exec_func("do_collect_bins_from_locale_tree", d) + do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='eglibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True) + else: + bb.note("generation of binary locales disabled. this may break i18n!") + +} + +# We want to do this indirection so that we can safely 'return' +# from the called function even though we're prepending +python populate_packages_prepend () { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_eglibc', 'libc6', d) + bb.data.setVar('PKG_eglibc-dev', 'libc6-dev', d) + bb.build.exec_func('package_do_split_gconvs', d) +} diff --git a/packages/glibc/eglibc-svn/.mtn2git_empty b/packages/glibc/eglibc-svn/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glibc/eglibc-svn/.mtn2git_empty diff --git a/packages/glibc/eglibc-svn/export-fcntl2.patch b/packages/glibc/eglibc-svn/export-fcntl2.patch new file mode 100644 index 0000000000..0bf6c57852 --- /dev/null +++ b/packages/glibc/eglibc-svn/export-fcntl2.patch @@ -0,0 +1,11 @@ +--- libc/io/Makefile.orig 2007-08-07 17:41:33.000000000 -0700 ++++ libc/io/Makefile 2007-08-07 17:42:25.000000000 -0700 +@@ -23,7 +23,7 @@ subdir := io + + headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \ + sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \ +- poll.h sys/poll.h bits/poll.h \ ++ poll.h sys/poll.h bits/poll.h bits/fcntl2.h \ + utime.h ftw.h fts.h sys/sendfile.h + + routines := \ diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb new file mode 100644 index 0000000000..21079bb895 --- /dev/null +++ b/packages/glibc/eglibc_svn.bb @@ -0,0 +1,135 @@ +require glibc.inc + +DEFAULT_PREFERENCE = "-1" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" +PV = "2.6+svn${SRCDATE}" +SRC_URI = "svn://svn.eglibc.org;module=trunk \ + file://export-fcntl2.patch;patch=1 \ + file://etc/ld.so.conf \ + file://generate-supported.mk" +S = "${WORKDIR}/trunk/libc" +B = "${WORKDIR}/build-${TARGET_SYS}" + +#PACKAGES_DYNAMIC = "libc6*" +#RPROVIDES_${PN}-dev = "libc6-dev" + +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" +TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" + +GLIBC_ADDONS ?= "ports,nptl,libidn" + +GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" + +# +# 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 bb, re + uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + + +EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF}" + +EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" + +do_configure_prepend() { + if test -d ${WORKDIR}/trunk/ports ; then + mv ${WORKDIR}/trunk/ports ${S}/ + fi +} + +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 ${WORKDIR} -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 <staging>/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 || oewarn "unable to generate header for $r" + done + ) +} + +do_stage() { + rm -f ${STAGING_LIBDIR}/libc.so.6 + oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${STAGING_LIBDIR}/libc.so.6' \ + install-headers install-lib + + install -d ${STAGING_INCDIR}/gnu \ + ${STAGING_INCDIR}/bits \ + ${STAGING_INCDIR}/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ + install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ + done + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so + + rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6 + oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \ + install-headers install-lib + + install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \ + ${CROSS_DIR}/${TARGET_SYS}/include/bits \ + ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/ + install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/ + done + + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so +} + +require eglibc-package.bbclass diff --git a/packages/glibc/files/etc/ld.so.conf b/packages/glibc/files/etc/ld.so.conf index fb1aab516d..dfa65edb85 100644 --- a/packages/glibc/files/etc/ld.so.conf +++ b/packages/glibc/files/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib /usr/X11R6/lib diff --git a/packages/glibc/files/ppc-ld-nofpu-20070104.patch b/packages/glibc/files/ppc-ld-nofpu-20070104.patch new file mode 100644 index 0000000000..d5b1d31774 --- /dev/null +++ b/packages/glibc/files/ppc-ld-nofpu-20070104.patch @@ -0,0 +1,190 @@ +2007-01-12 Steven Munroe <sjmunroe@us.ibm.com> + Joe Kerian <jkerian@us.us.ibm.com> + + [BZ #2749] + * sysdeps/ieee754/ldbl-128ibm/s_copysignl.c: + Include <math_ldbl_opt.h>. + Remove weak_alias. Use long_double_symbol macro. + (__copysignl): Use signbit() for comparison. + * sysdeps/ieee754/ldbl-128ibm/s_fabsl.c: Correct parms for + SET_LDOUBLE_WORDS64. + + [BZ #2423, #2749] + * sysdeps/ieee754/ldbl-128ibm/s_ceill.c: Don't include <fenv_libc.h>. + (__ceill): Remove calls to fegetround(), fesetround(). + * sysdeps/ieee754/ldbl-128ibm/s_floorl.c: Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_roundl.c: Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_truncl.c: Likewise. + +diff -urN libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_ceill.c libc24/sysdeps/ieee754/ldbl-128ibm/s_ceill.c +--- libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_ceill.c 2006-03-16 05:46:37.000000000 -0600 ++++ libc24/sysdeps/ieee754/ldbl-128ibm/s_ceill.c 2007-01-11 10:30:12.856890432 -0600 +@@ -19,7 +19,6 @@ + 02111-1307 USA. */ + + #include <math.h> +-#include <fenv_libc.h> + #include <math_ldbl_opt.h> + #include <float.h> + #include <ieee754.h> +@@ -44,11 +43,9 @@ + __builtin_inf ()), 1)) + { + double orig_xh; +- int save_round = fegetround (); + + /* Long double arithmetic, including the canonicalisation below, + only works in round-to-nearest mode. */ +- fesetround (FE_TONEAREST); + + /* Convert the high double to integer. */ + orig_xh = xh; +@@ -81,8 +78,6 @@ + /* Ensure we return -0 rather than +0 when appropriate. */ + if (orig_xh < 0.0) + xh = -__builtin_fabs (xh); +- +- fesetround (save_round); + } + + return ldbl_pack (xh, xl); +diff -urN libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c libc24/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c +--- libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c 2006-01-27 18:07:25.000000000 -0600 ++++ libc24/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c 2007-01-11 10:30:12.857890280 -0600 +@@ -25,6 +25,7 @@ + + #include "math.h" + #include "math_private.h" ++#include <math_ldbl_opt.h> + + #ifdef __STDC__ + long double __copysignl(long double x, long double y) +@@ -33,13 +34,13 @@ + long double x,y; + #endif + { +- if (y < 0.0) +- { +- if (x >= 0.0) +- x = -x; +- } +- else if (x < 0.0) ++ if( signbit(x) != signbit(y) ) + x = -x; + return x; + } +-weak_alias (__copysignl, copysignl) ++ ++#ifdef IS_IN_libm ++long_double_symbol (libm, __copysignl, copysignl); ++#else ++long_double_symbol (libc, __copysignl, copysignl); ++#endif +diff -urN libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c libc24/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c +--- libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c 2006-01-27 18:07:25.000000000 -0600 ++++ libc24/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c 2007-01-11 10:30:12.857890280 -0600 +@@ -37,7 +37,7 @@ + GET_LDOUBLE_WORDS64(hx,lx,x); + lx = lx ^ ( hx & 0x8000000000000000LL ); + hx = hx & 0x7fffffffffffffffLL; +- SET_LDOUBLE_WORDS64(hx,lx,x); ++ SET_LDOUBLE_WORDS64(x,hx,lx); + return x; + } + long_double_symbol (libm, __fabsl, fabsl); +diff -urN libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_floorl.c libc24/sysdeps/ieee754/ldbl-128ibm/s_floorl.c +--- libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_floorl.c 2006-03-16 05:46:37.000000000 -0600 ++++ libc24/sysdeps/ieee754/ldbl-128ibm/s_floorl.c 2007-01-11 10:30:12.858890128 -0600 +@@ -19,7 +19,6 @@ + 02111-1307 USA. */ + + #include <math.h> +-#include <fenv_libc.h> + #include <math_ldbl_opt.h> + #include <float.h> + #include <ieee754.h> +@@ -43,11 +42,8 @@ + && __builtin_isless (__builtin_fabs (xh), + __builtin_inf ()), 1)) + { +- int save_round = fegetround (); +- + /* Long double arithmetic, including the canonicalisation below, + only works in round-to-nearest mode. */ +- fesetround (FE_TONEAREST); + + /* Convert the high double to integer. */ + hi = ldbl_nearbyint (xh); +@@ -75,8 +71,6 @@ + xh = hi; + xl = lo; + ldbl_canonicalize (&xh, &xl); +- +- fesetround (save_round); + } + + return ldbl_pack (xh, xl); +diff -urN libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_roundl.c libc24/sysdeps/ieee754/ldbl-128ibm/s_roundl.c +--- libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_roundl.c 2006-03-16 05:46:37.000000000 -0600 ++++ libc24/sysdeps/ieee754/ldbl-128ibm/s_roundl.c 2007-01-11 10:30:12.859889976 -0600 +@@ -22,7 +22,6 @@ + when it's coded in C. */ + + #include <math.h> +-#include <fenv_libc.h> + #include <math_ldbl_opt.h> + #include <float.h> + #include <ieee754.h> +@@ -47,11 +46,9 @@ + __builtin_inf ()), 1)) + { + double orig_xh; +- int save_round = fegetround (); + + /* Long double arithmetic, including the canonicalisation below, + only works in round-to-nearest mode. */ +- fesetround (FE_TONEAREST); + + /* Convert the high double to integer. */ + orig_xh = xh; +@@ -88,8 +85,6 @@ + xh = hi; + xl = lo; + ldbl_canonicalize (&xh, &xl); +- +- fesetround (save_round); + } + + return ldbl_pack (xh, xl); +diff -urN libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_truncl.c libc24/sysdeps/ieee754/ldbl-128ibm/s_truncl.c +--- libc25-cvstip-20070104/sysdeps/ieee754/ldbl-128ibm/s_truncl.c 2006-03-16 05:46:37.000000000 -0600 ++++ libc24/sysdeps/ieee754/ldbl-128ibm/s_truncl.c 2007-01-11 10:30:12.860889824 -0600 +@@ -22,7 +22,6 @@ + when it's coded in C. */ + + #include <math.h> +-#include <fenv_libc.h> + #include <math_ldbl_opt.h> + #include <float.h> + #include <ieee754.h> +@@ -47,11 +46,9 @@ + __builtin_inf ()), 1)) + { + double orig_xh; +- int save_round = fegetround (); + + /* Long double arithmetic, including the canonicalisation below, + only works in round-to-nearest mode. */ +- fesetround (FE_TONEAREST); + + /* Convert the high double to integer. */ + orig_xh = xh; +@@ -92,8 +89,6 @@ + /* Ensure we return -0 rather than +0 when appropriate. */ + if (orig_xh < 0.0) + xh = -__builtin_fabs (xh); +- +- fesetround (save_round); + } + + return ldbl_pack (xh, xl); diff --git a/packages/glibc/files/ppc-ports-ld-nofpu-20070114.patch b/packages/glibc/files/ppc-ports-ld-nofpu-20070114.patch new file mode 100644 index 0000000000..b4d99592f6 --- /dev/null +++ b/packages/glibc/files/ppc-ports-ld-nofpu-20070114.patch @@ -0,0 +1,38 @@ +2007-01-14 Steven Munroe <sjmunroe@us.ibm.com> + + [BZ #2749] + * sysdeps/powerpc/nofpu/fenv_libc.h: New file. + +diff -urN dummy-libc/ports-cvstip-20070104/sysdeps/powerpc/nofpu/fenv_libc.h libc25/ports/sysdeps/powerpc/nofpu/fenv_libc.h +--- dummy-libc/ports-cvstip-20070104/sysdeps/powerpc/nofpu/fenv_libc.h Wed Dec 31 18:00:00 1969 ++++ libc25/ports/sysdeps/powerpc/nofpu/fenv_libc.h Thu Jan 11 11:00:53 2007 +@@ -0,0 +1,29 @@ ++/* Internal libc stuff for floating point environment routines. ++ Copyright (C) 2007 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#ifndef _FENV_LIBC_H ++#define _FENV_LIBC_H 1 ++ ++/* fenv_libc.h is used in libm implementations of ldbl-128ibm. So we ++ need this version in the soft-fp to at minimum include fenv.h to ++ get the fegetround definition. */ ++ ++#include <fenv.h> ++ ++#endif /* fenv_libc.h */ diff --git a/packages/glibc/files/ppc-sfp-machine.patch b/packages/glibc/files/ppc-sfp-machine.patch new file mode 100644 index 0000000000..6171a03411 --- /dev/null +++ b/packages/glibc/files/ppc-sfp-machine.patch @@ -0,0 +1,297 @@ +This patch combined with the other patches from Bugzilla #2749 allows +powerpc32 to build. The Subdirs pulls in the soft-fp directory from +libc, The Implies pulls in the ports powerpc/soft-fp directory which +includes sfp-machine.h + +The get/set/swapcontext changes overide the common implimentation in +libc to avoid using hardware FP instructions. + + + +2006-06-01 Steven Munroe <sjmunroe@us.ibm.com> + + [BZ #2749] + * sysdeps/powerpc/soft-fp/Subdirs: New file. + * sysdeps/powerpc/soft-fp/sfp-machine.h: New file. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies: New file. + + * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/getcontext.S: + New file. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/setcontext.S: + New file. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/swapcontext.S: + New file. + +diff -urN dummy-libc/ports-cvstip-20060512/sysdeps/powerpc/soft-fp/Subdirs +libc24/ports/sysdeps/powerpc/soft-fp/Subdirs +--- dummy-libc/ports-cvstip-20060512/sysdeps/powerpc/soft-fp/Subdirs Wed Dec 31 18:00:00 1969 ++++ libc24/ports/sysdeps/powerpc/soft-fp/Subdirs Wed May 31 16:58:44 2006 +@@ -0,0 +1,1 @@ ++soft-fp +diff -urN dummy-libc/ports-cvstip-20060512/sysdeps/powerpc/soft-fp/sfp-machine.h +libc24/ports/sysdeps/powerpc/soft-fp/sfp-machine.h +--- dummy-libc/ports-cvstip-20060512/sysdeps/powerpc/soft-fp/sfp-machine.h Wed Dec 31 18:00:00 1969 ++++ libc24/ports/sysdeps/powerpc/soft-fp/sfp-machine.h Wed May 31 13:57:07 2006 +@@ -0,0 +1,63 @@ ++#define _FP_W_TYPE_SIZE 32 ++#define _FP_W_TYPE unsigned long ++#define _FP_WS_TYPE signed long ++#define _FP_I_TYPE long ++ ++#define _FP_MUL_MEAT_S(R,X,Y) \ ++ _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm) ++#define _FP_MUL_MEAT_D(R,X,Y) \ ++ _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm) ++#define _FP_MUL_MEAT_Q(R,X,Y) \ ++ _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) ++ ++#define _FP_DIV_MEAT_S(R,X,Y) _FP_DIV_MEAT_1_loop(S,R,X,Y) ++#define _FP_DIV_MEAT_D(R,X,Y) _FP_DIV_MEAT_2_udiv(D,R,X,Y) ++#define _FP_DIV_MEAT_Q(R,X,Y) _FP_DIV_MEAT_4_udiv(Q,R,X,Y) ++ ++#define _FP_NANFRAC_S ((_FP_QNANBIT_S << 1) - 1) ++#define _FP_NANFRAC_D ((_FP_QNANBIT_D << 1) - 1), -1 ++#define _FP_NANFRAC_Q ((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1 ++#define _FP_NANSIGN_S 0 ++#define _FP_NANSIGN_D 0 ++#define _FP_NANSIGN_Q 0 ++ ++#define _FP_KEEPNANFRACP 1 ++ ++/* Someone please check this. */ ++#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP) \ ++ do { \ ++ if ((_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs) \ ++ && !(_FP_FRAC_HIGH_RAW_##fs(Y) & _FP_QNANBIT_##fs)) \ ++ { \ ++ R##_s = Y##_s; \ ++ _FP_FRAC_COPY_##wc(R,Y); \ ++ } \ ++ else \ ++ { \ ++ R##_s = X##_s; \ ++ _FP_FRAC_COPY_##wc(R,X); \ ++ } \ ++ R##_c = FP_CLS_NAN; \ ++ } while (0) ++ ++/* Exception flags. We use the bit positions of the appropriate bits ++ in the FPSCR, which also correspond to the FE_* bits. This makes ++ everything easier ;-). */ ++#define FP_EX_INVALID (1 << (31 - 2)) ++#define FP_EX_OVERFLOW (1 << (31 - 3)) ++#define FP_EX_UNDERFLOW (1 << (31 - 4)) ++#define FP_EX_DENORM FP_EX_UNDERFLOW ++#define FP_EX_DIVZERO (1 << (31 - 5)) ++#define FP_EX_INEXACT (1 << (31 - 6)) ++ ++#define FP_HANDLE_EXCEPTIONS __simulate_exceptions (_fex) ++#define FP_ROUNDMODE __sim_round_mode ++ ++extern int __sim_exceptions; ++libc_hidden_proto (__sim_exceptions); ++extern int __sim_disabled_exceptions; ++libc_hidden_proto (__sim_disabled_exceptions); ++extern int __sim_round_mode; ++libc_hidden_proto (__sim_round_mode); ++ ++extern void __simulate_exceptions (int x) attribute_hidden; +diff -urN dummy-libc/ports-cvstip-20060512/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies +libc24/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies +--- dummy-libc/ports-cvstip-20060512/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies Wed Dec 31 18:00:00 1969 ++++ libc24/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies Wed May 31 15:46:44 2006 +@@ -0,0 +1,1 @@ ++powerpc/soft-fp +diff -urN dummy-libc/ports-cvstip-20060512/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/getcontext.S +libc24/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/getcontext.S +--- dummy-libc/ports-cvstip-20060512/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/getcontext.S Wed Dec 31 18:00:00 1969 ++++ libc24/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/getcontext.S Thu Jun 01 15:31:03 2006 +@@ -0,0 +1,59 @@ ++/* Save current context. ++ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <sysdep.h> ++#include <rtld-global-offsets.h> ++#include <shlib-compat.h> ++ ++#define __ASSEMBLY__ ++#include <asm/ptrace.h> ++#include "ucontext_i.h" ++ ++#define __CONTEXT_FUNC_NAME __getcontext ++#undef __CONTEXT_ENABLE_FPRS ++#undef __CONTEXT_ENABLE_VRS ++ ++#include "getcontext-common.S" ++ ++versioned_symbol (libc, __getcontext, getcontext, GLIBC_2_3_4) ++ ++#if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4) ++ ++/* For the nofpu case the old/new versions are the same function. */ ++strong_alias (__getcontext, __novec_getcontext) ++ ++compat_symbol (libc, __novec_getcontext, getcontext, GLIBC_2_3_3) ++ ++#endif ++ ++#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3_3) ++ ++#define _ERRNO_H 1 ++#include <bits/errno.h> ++ ++ compat_text_section ++ENTRY (__getcontext_stub) ++ li r3,ENOSYS ++ b __syscall_error@local ++END (__getcontext_stub) ++ .previous ++ ++compat_symbol (libc, __getcontext_stub, getcontext, GLIBC_2_1) ++ ++#endif +diff -urN dummy-libc/ports-cvstip-20060512/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/setcontext.S +libc24/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/setcontext.S +--- dummy-libc/ports-cvstip-20060512/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/setcontext.S Wed Dec 31 18:00:00 1969 ++++ libc24/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/setcontext.S Thu Jun 01 15:31:03 2006 +@@ -0,0 +1,59 @@ ++/* Jump to a new context. ++ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <sysdep.h> ++#include <rtld-global-offsets.h> ++#include <shlib-compat.h> ++ ++#define __ASSEMBLY__ ++#include <asm/ptrace.h> ++#include "ucontext_i.h" ++ ++#define __CONTEXT_FUNC_NAME __setcontext ++#undef __CONTEXT_ENABLE_FPRS ++#undef __CONTEXT_ENABLE_VRS ++ ++#include "setcontext-common.S" ++ ++versioned_symbol (libc, __setcontext, setcontext, GLIBC_2_3_4) ++ ++#if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4) ++ ++/* For the nofpu case the old/new versions are the same function. */ ++strong_alias (__setcontext, __novec_setcontext) ++ ++compat_symbol (libc, __novec_setcontext, setcontext, GLIBC_2_3_3) ++ ++#endif ++ ++#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_3) ++ ++#define _ERRNO_H 1 ++#include <bits/errno.h> ++ ++ compat_text_section ++ENTRY (__setcontext_stub) ++ li r3,ENOSYS ++ b __syscall_error@local ++END (__setcontext_stub) ++ .previous ++ ++compat_symbol (libc, __setcontext_stub, setcontext, GLIBC_2_0) ++ ++#endif +diff -urN dummy-libc/ports-cvstip-20060512/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/swapcontext.S +libc24/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/swapcontext.S +--- dummy-libc/ports-cvstip-20060512/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/swapcontext.S Wed Dec 31 18:00:00 1969 ++++ libc24/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/swapcontext.S Thu Jun 01 15:31:03 2006 +@@ -0,0 +1,59 @@ ++/* Save current context and jump to a new context. ++ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <sysdep.h> ++#include <rtld-global-offsets.h> ++#include <shlib-compat.h> ++ ++#define __ASSEMBLY__ ++#include <asm/ptrace.h> ++#include "ucontext_i.h" ++ ++#define __CONTEXT_FUNC_NAME __swapcontext ++#undef __CONTEXT_ENABLE_FPRS ++#undef __CONTEXT_ENABLE_VRS ++ ++# include "swapcontext-common.S" ++ ++versioned_symbol (libc, __swapcontext, swapcontext, GLIBC_2_3_4) ++ ++#if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4) ++ ++/* For the nofpu case the old/new versions are the same function. */ ++strong_alias (__swapcontext, __novec_swapcontext) ++ ++compat_symbol (libc, __novec_swapcontext, swapcontext, GLIBC_2_3_3) ++ ++#endif ++ ++#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3_3) ++ ++#define _ERRNO_H 1 ++#include <bits/errno.h> ++ ++ compat_text_section ++ENTRY (__swapcontext_stub) ++ li r3,ENOSYS ++ b __syscall_error@local ++END (__swapcontext_stub) ++ .previous ++ ++compat_symbol (libc, __swapcontext_stub, swapcontext, GLIBC_2_1) ++ ++#endif + diff --git a/packages/glibc/files/ppc-soft-fp-20070115.patch b/packages/glibc/files/ppc-soft-fp-20070115.patch new file mode 100644 index 0000000000..a84bc2f7cb --- /dev/null +++ b/packages/glibc/files/ppc-soft-fp-20070115.patch @@ -0,0 +1,182 @@ +2007-01-14 Steven Munroe <sjmunroe@us.ibm.com> + Joe Kerian <jkerian@us.us.ibm.com> + + [BZ #2749] + * soft-fp/op-4.h (__FP_FRAC_SUB_3, __FP_FRAC_SUB_4): Correct borrow + handling for high words. + * soft-fp/op-common.h (_FP_OVERFLOW_SEMIRAW): Always set inexact + and overflow for infinity. + (_FP_PACK_SEMIRAW): Update comment. Do not round if NaN or Inf. + + * math/basic-test.c (truncdfsf_test): New function. + [!NO_LONG_DOUBLE] (trunctfsf_test): New function. + [!NO_LONG_DOUBLE] (trunctfdf_test): New function. + Change main() to do_test. Define TEST_FUNCTION. Include test-skeleton.c. + (do_test): Run new tests. + +2007-01-15 Jakub Jelinek <jakub@redhat.com> + + * soft-fp/op-common.h (FP_TRUNC): When truncating a NaN, clear + workbits in semi-raw fraction. + + +diff -urN libc25-cvstip-20070104/math/basic-test.c libc24/math/basic-test.c +--- libc25-cvstip-20070104/math/basic-test.c 2001-07-05 23:55:35.000000000 -0500 ++++ libc24/math/basic-test.c 2007-01-15 11:41:17.260963824 -0600 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1999 Free Software Foundation, Inc. ++/* Copyright (C) 1999, 2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Andreas Jaeger <aj@suse.de>, 1999. + +@@ -107,17 +107,90 @@ + TEST_FUNC (double_test, double, nan, DBL_EPSILON, HUGE_VAL) + #ifndef NO_LONG_DOUBLE + TEST_FUNC (ldouble_test, long double, nanl, LDBL_EPSILON, HUGE_VALL) ++ ++void ++trunctfsf_test(void) ++{ ++ volatile long double Inf_var, NaN_var, zero_var, one_var; ++ float x1, x2; ++ ++ zero_var = 0.0; ++ one_var = 1.0; ++ NaN_var = zero_var/zero_var; ++ Inf_var = one_var / zero_var; ++ ++ (void) &zero_var; ++ (void) &one_var; ++ (void) &NaN_var; ++ (void) &Inf_var; ++ ++ x1 = (float)NaN_var; ++ check (" float x = (float)((long double)NaN))", isnan (x1) != 0); ++ x2 = (float)Inf_var; ++ check (" float x = (float)((long double)Inf))", isinf (x2) != 0); ++} ++ ++void ++trunctfdf_test(void) ++{ ++ volatile long double Inf_var, NaN_var, zero_var, one_var; ++ double x1, x2; ++ ++ zero_var = 0.0; ++ one_var = 1.0; ++ NaN_var = zero_var/zero_var; ++ Inf_var = one_var / zero_var; ++ ++ (void) &zero_var; ++ (void) &one_var; ++ (void) &NaN_var; ++ (void) &Inf_var; ++ ++ x1 = (double)NaN_var; ++ check (" double x = (double)((long double)NaN))", isnan (x1) != 0); ++ x2 = (double)Inf_var; ++ check (" double x = (double)((long double)Inf))", isinf (x2) != 0); ++} ++ + #endif + ++void ++truncdfsf_test(void) ++{ ++ volatile double Inf_var, NaN_var, zero_var, one_var; ++ float x1, x2; ++ ++ zero_var = 0.0; ++ one_var = 1.0; ++ NaN_var = zero_var/zero_var; ++ Inf_var = one_var / zero_var; ++ ++ (void) &zero_var; ++ (void) &one_var; ++ (void) &NaN_var; ++ (void) &Inf_var; ++ ++ x1 = (float)NaN_var; ++ check (" float x = (float)((double)NaN))", isnan (x1) != 0); ++ x2 = (float)Inf_var; ++ check (" float x = (float)((double)Inf))", isinf (x2) != 0); ++} ++ + int +-main (void) ++do_test (void) + { + float_test (); + double_test (); ++ truncdfsf_test(); + + #ifndef NO_LONG_DOUBLE + ldouble_test (); ++ trunctfsf_test(); ++ trunctfdf_test(); + #endif + + return errors != 0; + } ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +diff -urN libc25-cvstip-20070104/soft-fp/op-4.h libc24/soft-fp/op-4.h +--- libc25-cvstip-20070104/soft-fp/op-4.h 2006-04-04 03:24:47.000000000 -0500 ++++ libc24/soft-fp/op-4.h 2007-01-11 11:00:53.000000000 -0600 +@@ -564,7 +564,7 @@ + r1 = x1 - y1; \ + _c2 = r1 > x1; \ + r1 -= _c1; \ +- _c2 |= r1 > _c1; \ ++ _c2 |= _c1 && (y1 == x1); \ + r2 = x2 - y2 - _c2; \ + } while (0) + #endif +@@ -578,11 +578,11 @@ + r1 = x1 - y1; \ + _c2 = r1 > x1; \ + r1 -= _c1; \ +- _c2 |= r1 > _c1; \ ++ _c2 |= _c1 && (y1 == x1); \ + r2 = x2 - y2; \ + _c3 = r2 > x2; \ + r2 -= _c2; \ +- _c3 |= r2 > _c2; \ ++ _c3 |= _c2 && (y2 == x2); \ + r3 = x3 - y3 - _c3; \ + } while (0) + #endif +diff -urN libc25-cvstip-20070104/soft-fp/op-common.h libc24/soft-fp/op-common.h +--- libc25-cvstip-20070104/soft-fp/op-common.h 2006-04-04 03:24:47.000000000 -0500 ++++ libc24/soft-fp/op-common.h 2007-01-15 11:46:17.290882288 -0600 +@@ -1,5 +1,5 @@ + /* Software floating-point emulation. Common operations. +- Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc. ++ Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Richard Henderson (rth@cygnus.com), + Jakub Jelinek (jj@ultra.linux.cz), +@@ -99,10 +99,10 @@ + else \ + { \ + X##_e = _FP_EXPMAX_##fs - 1; \ +- FP_SET_EXCEPTION(FP_EX_OVERFLOW); \ +- FP_SET_EXCEPTION(FP_EX_INEXACT); \ + _FP_FRAC_SET_##wc(X, _FP_MAXFRAC_##wc); \ + } \ ++ FP_SET_EXCEPTION(FP_EX_INEXACT); \ ++ FP_SET_EXCEPTION(FP_EX_OVERFLOW); \ + } while (0) + + /* Check for a semi-raw value being a signaling NaN and raise the +@@ -1252,6 +1252,9 @@ + _FP_FRAC_SRL_##swc(S, (_FP_WFRACBITS_##sfs \ + - _FP_WFRACBITS_##dfs)); \ + _FP_FRAC_COPY_##dwc##_##swc(D, S); \ ++ /* Semi-raw NaN must have all workbits cleared. */ \ ++ _FP_FRAC_LOW_##dwc(D) \ ++ &= ~(_FP_W_TYPE) ((1 << _FP_WORKBITS) - 1); \ + _FP_FRAC_HIGH_##dfs(D) |= _FP_QNANBIT_SH_##dfs; \ + } \ + } \ diff --git a/packages/glibc/glibc-2.2.5/etc/ld.so.conf b/packages/glibc/glibc-2.2.5/etc/ld.so.conf index 3f9b41aabb..46e06d3f0a 100644 --- a/packages/glibc/glibc-2.2.5/etc/ld.so.conf +++ b/packages/glibc/glibc-2.2.5/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib diff --git a/packages/glibc/glibc-2.3.2/etc/ld.so.conf b/packages/glibc/glibc-2.3.2/etc/ld.so.conf index 3f9b41aabb..46e06d3f0a 100644 --- a/packages/glibc/glibc-2.3.2/etc/ld.so.conf +++ b/packages/glibc/glibc-2.3.2/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib diff --git a/packages/glibc/glibc-2.4/etc/ld.so.conf b/packages/glibc/glibc-2.4/etc/ld.so.conf index 3f9b41aabb..46e06d3f0a 100644 --- a/packages/glibc/glibc-2.4/etc/ld.so.conf +++ b/packages/glibc/glibc-2.4/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib diff --git a/packages/glibc/glibc-2.4/ldd-unbash.patch b/packages/glibc/glibc-2.4/ldd-unbash.patch new file mode 100644 index 0000000000..2fb8854b49 --- /dev/null +++ b/packages/glibc/glibc-2.4/ldd-unbash.patch @@ -0,0 +1,11 @@ +--- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000 ++++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000 +@@ -110,7 +110,7 @@ + # environments where the executed program might not have permissions + # to write to the console/tty. But only bash 3.x supports the pipefail + # option, and we don't bother to handle the case for older bash versions. +-if set -o pipefail 2> /dev/null; then ++if false; then + try_trace() { + eval $add_env '"$@"' | cat + } diff --git a/packages/glibc/glibc-cvs/etc/ld.so.conf b/packages/glibc/glibc-cvs/etc/ld.so.conf index 3f9b41aabb..46e06d3f0a 100644 --- a/packages/glibc/glibc-cvs/etc/ld.so.conf +++ b/packages/glibc/glibc-cvs/etc/ld.so.conf @@ -1,3 +1,2 @@ /usr/local/lib -/opt/QtPalmtop/lib diff --git a/packages/glibc/glibc-initial_2.6.bb b/packages/glibc/glibc-initial_2.6.bb new file mode 100644 index 0000000000..0d4a79f2a4 --- /dev/null +++ b/packages/glibc/glibc-initial_2.6.bb @@ -0,0 +1,46 @@ +require glibc_${PV}.bb + +DEPENDS = "linux-libc-headers" +PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +PACKAGES = "" + +do_configure () { + sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure + chmod +x ${S}/configure + unset CFLAGS + CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ + --without-cvs --disable-sanity-checks \ + --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \ + --enable-hacker-mode + if grep -q GLIBC_2.3 ${S}/ChangeLog; then + # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. + # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. + # Another workaround might be to tell configure to not use any cross options to $(CC). + # The real fix would be to get install-headers to not generate errlist-compat.c. + make sysdeps/gnu/errlist.c + mkdir -p stdio-common + touch stdio-common/errlist-compat.c + fi +} + +do_compile () { + : +} + +do_stage () { + oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers + + # 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 ${CROSS_DIR}/${TARGET_SYS}/include/gnu + touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h + cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h +} + +do_install () { + : +} diff --git a/packages/glibc/glibc-intermediate_2.4.bb b/packages/glibc/glibc-intermediate_2.4.bb index 75dae48532..e6aad1cc63 100644 --- a/packages/glibc/glibc-intermediate_2.4.bb +++ b/packages/glibc/glibc-intermediate_2.4.bb @@ -7,6 +7,7 @@ do_install () { } PACKAGES = "" +PACKAGES_DYNAMIC = "" PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" GLIBC_ADDONS = "nptl,ports" diff --git a/packages/glibc/glibc-intermediate_2.5.bb b/packages/glibc/glibc-intermediate_2.5.bb index 7f34af2b0d..7610f560a7 100644 --- a/packages/glibc/glibc-intermediate_2.5.bb +++ b/packages/glibc/glibc-intermediate_2.5.bb @@ -12,6 +12,7 @@ do_configure_prepend() { PACKAGES = "" +PACKAGES_DYNAMIC = "" PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" GLIBC_ADDONS = "nptl,ports" diff --git a/packages/glibc/glibc-intermediate_2.6.bb b/packages/glibc/glibc-intermediate_2.6.bb new file mode 100644 index 0000000000..7610f560a7 --- /dev/null +++ b/packages/glibc/glibc-intermediate_2.6.bb @@ -0,0 +1,19 @@ +require glibc_${PV}.bb + +do_install () { + : +} + +# gcc uses -Werror which break on a "you have no thumb interwork" _warning_ +do_configure_prepend() { + sed -i s:-Werror:: ${S}/configure +} + + + +PACKAGES = "" +PACKAGES_DYNAMIC = "" +PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" +DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" +GLIBC_ADDONS = "nptl,ports" +GLIBC_EXTRA_OECONF = "" diff --git a/packages/glibc/glibc-intermediate_cvs.bb b/packages/glibc/glibc-intermediate_cvs.bb index 2283037c87..4f9d58ee6f 100644 --- a/packages/glibc/glibc-intermediate_cvs.bb +++ b/packages/glibc/glibc-intermediate_cvs.bb @@ -8,6 +8,7 @@ do_install () { } PACKAGES = "" +PACKAGES_DYNAMIC = "" PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" GLIBC_ADDONS = "linuxthreads" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 4cad10fd73..ae6a085e74 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -40,7 +40,7 @@ FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen" FILES_nscd = "${sbindir}/nscd*" FILES_glibc-utils = "${bindir}/* ${sbindir}/*" FILES_glibc-gconv = "${libdir}/gconv/*" -FILES_${PN}-dbg += " ${libdir}/gconv/.debug" +FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug" FILES_catchsegv = "${bindir}/catchsegv" RDEPENDS_catchsegv = "libsegfault" FILES_glibc-pcprofile = "/lib/libpcprofile.so" @@ -175,10 +175,10 @@ python package_do_split_gconvs () { bb.error("datadir not defined") return - gconv_libdir = os.path.join(libdir, "gconv") - charmap_dir = os.path.join(datadir, "i18n", "charmaps") - locales_dir = os.path.join(datadir, "i18n", "locales") - binary_locales_dir = os.path.join(libdir, "locale") + gconv_libdir = base_path_join(libdir, "gconv") + charmap_dir = base_path_join(datadir, "i18n", "charmaps") + locales_dir = base_path_join(datadir, "i18n", "locales") + binary_locales_dir = base_path_join(libdir, "locale") do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', extra_depends='glibc-gconv') @@ -202,9 +202,14 @@ python package_do_split_gconvs () { do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d) - f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") - supported = f.readlines() - f.close() + supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1) + if not supported or supported == "all": + f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") + supported = f.readlines() + f.close() + else: + supported = supported.split() + supported = map(lambda s:s.replace(".", " ") + "\n", supported) dot_re = re.compile("(.*)\.(.*)") @@ -252,9 +257,9 @@ python package_do_split_gconvs () { bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) - treedir = os.path.join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") path = bb.data.getVar("PATH", d, 1) - i18npath = os.path.join(treedir, datadir, "i18n") + i18npath = base_path_join(treedir, datadir, "i18n") localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc index 7078a1c09f..10c2796825 100644 --- a/packages/glibc/glibc.inc +++ b/packages/glibc/glibc.inc @@ -3,7 +3,16 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" SECTION = "libs" PRIORITY = "required" LICENSE = "LGPL" -PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" - +# nptl needs unwind support in gcc, which can't be built without glibc. +DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" +PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" +PROVIDES += "virtual/libintl virtual/libiconv" + +inherit autotools + +GLIBC_EXTRA_OECONF ?= "" +INHIBIT_DEFAULT_DEPS = "1" + +PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 75f08be942..82ab193073 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -6,7 +6,6 @@ PR = "r10" DEFAULT_PREFERENCE_sh3 = "-99" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -24,12 +23,7 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES_unslung = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" +PROVIDES_unslung = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc libc6-unslung" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" @@ -113,8 +107,6 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \ S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 40fef7bed4..85f64371a8 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -6,13 +6,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r22" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" - -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -38,8 +31,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 1dba326201..87a6906915 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -5,7 +5,6 @@ PR = "r11" DEFAULT_PREFERENCE_sh3 = "-99" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -23,13 +22,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -PROVIDES += "virtual/libintl virtual/libiconv" - -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo" @@ -114,8 +106,6 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 9286fce398..6bbc8ec8af 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -6,7 +6,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r7" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_i686 = "0" @@ -29,12 +28,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \ @@ -57,8 +50,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index 6382d12e57..576047ce1e 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -6,19 +6,12 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r7" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_i686 = "0" DEFAULT_PREFERENCE_sh3 = "0" DEFAULT_PREFERENCE_sh4 = "0" -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \ @@ -42,8 +35,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index f955a6e0a0..4a548fa9bc 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -8,16 +8,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r5" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \ @@ -43,8 +36,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 0db2616a75..3f3690a73c 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -8,7 +8,6 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mipsel = "0" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -26,12 +25,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo" @@ -58,8 +51,6 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 985df1dfaa..1319fb33d3 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -8,7 +8,6 @@ PR = "r13" DEFAULT_PREFERENCE_sh3="-1" GLIBC_ADDONS ?= "ports,linuxthreads" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN" @@ -28,12 +27,7 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -71,8 +65,6 @@ SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \ S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 4cf0b82b92..3752da1040 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -14,7 +14,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" @@ -34,12 +33,7 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -76,8 +70,6 @@ SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" S = "${WORKDIR}/glibc-2.4" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index f9f24bbe7f..f14ce45a94 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r4" +PR = "r6" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" @@ -15,7 +15,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" @@ -35,12 +34,7 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -62,6 +56,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ # file://glibc-2.4-openat-3.patch;patch=1 \ # file://fixup-aeabi-syscalls.patch;patch=1 \ file://zecke-sane-readelf.patch;patch=1 \ + file://ldd-unbash.patch;patch=1 \ file://generic-bits_select.h \ file://generic-bits_types.h \ file://generic-bits_typesizes.h \ @@ -74,13 +69,16 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" -SRC_URI_append_powerpc = " file://powerpc-sqrt-hack.diff;patch=1" +#powerpc patches to add support for soft-float +SRC_URI_append_powerpc= " file://ppc-sfp-machine.patch;patch=1 \ + file://ppc-soft-fp-20070115.patch;patch=1 \ + file://ppc-ld-nofpu-20070104.patch;patch=1 \ + file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \ + file://powerpc-sqrt-hack.diff;patch=1"" S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.6.bb b/packages/glibc/glibc_2.6.bb new file mode 100644 index 0000000000..b3880df613 --- /dev/null +++ b/packages/glibc/glibc_2.6.bb @@ -0,0 +1,204 @@ +require glibc.inc + +ARM_INSTRUCTION_SET = "arm" + +PACKAGES_DYNAMIC = "libc6*" +RPROVIDES_${PN}-dev = "libc6-dev" + +PR = "r0" + +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" +TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" + + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" + +GLIBC_ADDONS ?= "ports,nptl,libidn" + +GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" + +# +# 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 bb, re + uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" + +# file://noinfo.patch;patch=1 +# file://ldconfig.patch;patch=1;pnum=0 +# file://arm-machine-gmon.patch;patch=1;pnum=0 \ +# \ +# file://arm-ioperm.patch;patch=1;pnum=0 \ +# file://ldd.patch;patch=1;pnum=0 \ +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ + file://arm-memcpy.patch;patch=1 \ + file://arm-longlong.patch;patch=1 \ + file://fhs-linux-paths.patch;patch=1 \ + file://dl-cache-libcmp.patch;patch=1 \ + file://ldsocache-varrun.patch;patch=1 \ + file://nptl-crosscompile.patch;patch=1 \ + file://glibc-check_pf.patch;patch=1;pnum=0 \ +# file://glibc-2.4-compile.patch;patch=1 \ +# file://glibc-2.4-openat-3.patch;patch=1 \ +# file://fixup-aeabi-syscalls.patch;patch=1 \ + file://zecke-sane-readelf.patch;patch=1 \ + file://ldd-unbash.patch;patch=1 \ + file://generic-bits_select.h \ + file://generic-bits_types.h \ + file://generic-bits_typesizes.h \ + file://generic-bits_time.h \ + file://etc/ld.so.conf \ + file://generate-supported.mk" + + +# Build fails on sh3 and sh4 without additional patches +SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" +SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" + +#powerpc patches to add support for soft-float +SRC_URI_append_powerpc= " file://ppc-sfp-machine.patch;patch=1 \ + file://ppc-soft-fp-20070115.patch;patch=1 \ + file://ppc-ld-nofpu-20070104.patch;patch=1 \ + file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \ + file://powerpc-sqrt-hack.diff;patch=1"" + +S = "${WORKDIR}/glibc-${PV}" +B = "${WORKDIR}/build-${TARGET_SYS}" + +EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF}" + +EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" + +do_munge() { + # Integrate ports and libidn into tree + mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports + mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn + + # Ports isn't really working... Fix it + # Some of this is rather dirty, but it seems to be the only + # quick way to get this cruft to compile + rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + cp ${S}/nptl/sysdeps/pthread/bits/sigthread.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h + cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h + cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h + cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h + # Copy in generic stuff for not yet implemented headers + for i in ${S}/bits/*.h; do + F=`basename $i` + [ "$F" = "local_lim.h" ] && continue + [ "$F" = "errno.h" ] && continue + test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + done + # This is harmful; we need to get the one from nptl/sysdeps/pthreads + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h + # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h + # Obsoleted by sysdeps/gnu/bits/utmp.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h +} + +addtask munge before do_patch after do_unpack + + +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" + 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 <staging>/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 || oewarn "unable to generate header for $r" + done + ) +} + +do_stage() { + rm -f ${STAGING_LIBDIR}/libc.so.6 + oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${STAGING_LIBDIR}/libc.so.6' \ + install-headers install-lib + + install -d ${STAGING_INCDIR}/gnu \ + ${STAGING_INCDIR}/bits \ + ${STAGING_INCDIR}/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ + install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ + done + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so + + rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6 + oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \ + install-headers install-lib + + install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \ + ${CROSS_DIR}/${TARGET_SYS}/include/bits \ + ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/ + install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/ + done + + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so +} + +require glibc-package.bbclass diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index c85aa500f1..0ddcb8a447 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -5,7 +5,6 @@ PR = "r5" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" @@ -25,11 +24,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" # file://noinfo.patch;patch=1 @@ -58,8 +52,6 @@ SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ |