[oe-commits] org.oe.dev Move eglibc to a separate package. Adios glibc.
khem commit
oe at amethyst.openembedded.net
Sat May 24 07:12:50 UTC 2008
Move eglibc to a separate package. Adios glibc.
Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: 46d53145d5ac0e0abb1ccf922a205150d459843f
ViewMTN: http://monotone.openembedded.org/revision/info/46d53145d5ac0e0abb1ccf922a205150d459843f
Files:
1
packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch
packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch
packages/glibc/eglibc-initial_svn.bb
packages/eglibc/eglibc-initial_svn.bb
packages/glibc/eglibc-intermediate_svn.bb
packages/eglibc/eglibc-intermediate_svn.bb
packages/glibc/eglibc-package.bbclass
packages/eglibc/eglibc-package.bbclass
packages/glibc/eglibc-svn
packages/eglibc/eglibc-svn
packages/glibc/eglibc_svn.bb
packages/eglibc/eglibc_svn.bb
packages/eglibc
packages/eglibc/files
packages/eglibc/files/etc
packages/eglibc/eglibc-initial.inc
packages/eglibc/eglibc-intermediate.inc
packages/eglibc/eglibc-stage.inc
packages/eglibc/eglibc.inc
packages/eglibc/files/etc/ld.so.conf
packages/eglibc/files/generate-supported.mk
Diffs:
#
# mt diff -rf2f4b5afb4a12de427743160e41723c1a54ad1c6 -r46d53145d5ac0e0abb1ccf922a205150d459843f
#
#
#
# delete "packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch"
#
# delete "packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch"
#
# rename "packages/glibc/eglibc-initial_svn.bb"
# to "packages/eglibc/eglibc-initial_svn.bb"
#
# rename "packages/glibc/eglibc-intermediate_svn.bb"
# to "packages/eglibc/eglibc-intermediate_svn.bb"
#
# rename "packages/glibc/eglibc-package.bbclass"
# to "packages/eglibc/eglibc-package.bbclass"
#
# rename "packages/glibc/eglibc-svn"
# to "packages/eglibc/eglibc-svn"
#
# rename "packages/glibc/eglibc_svn.bb"
# to "packages/eglibc/eglibc_svn.bb"
#
# add_dir "packages/eglibc"
#
# add_dir "packages/eglibc/files"
#
# add_dir "packages/eglibc/files/etc"
#
# add_file "packages/eglibc/eglibc-initial.inc"
# content [9cc9a816e903fd588bfe9b6529f690d24297a54b]
#
# add_file "packages/eglibc/eglibc-intermediate.inc"
# content [44c319922c41be728547bbcc0e10b47e1ac00e02]
#
# add_file "packages/eglibc/eglibc-stage.inc"
# content [4cabc49eb0552ed4b7a83649bacd02dec1d6307c]
#
# add_file "packages/eglibc/eglibc.inc"
# content [20ecb0b8894a6fa79214db154c8cd4e8458d7237]
#
# add_file "packages/eglibc/files/etc/ld.so.conf"
# content [f121cfac68db7d77f815ba3ae19f4d0e9d71e9a9]
#
# add_file "packages/eglibc/files/generate-supported.mk"
# content [f3b671988f6b2f0dea05190d24dbadfa147f6b6d]
#
# patch "packages/eglibc/eglibc-initial_svn.bb"
# from [d2d1ddf74dfda515dc592de07fd2510121c8f2af]
# to [a4c9652d0de37ac0abfcd55c52adce25ff66084c]
#
# patch "packages/eglibc/eglibc-intermediate_svn.bb"
# from [21404b0d7ead89e15d711d84009c0873dddf6ade]
# to [f9887693f966ca7f4608681ee51e4c19f3c063e0]
#
# patch "packages/eglibc/eglibc-package.bbclass"
# from [aee684fa0a585cebef668deddd667baf05049150]
# to [4c8a14b11d10890e3bf7171190c5e5734ae40101]
#
# patch "packages/eglibc/eglibc_svn.bb"
# from [693cfbc95cb7166e12ced9da2affddab022ac474]
# to [cfab52709e02a2130813453bf1ecea896dc28a6b]
#
============================================================
--- packages/eglibc/eglibc-initial.inc 9cc9a816e903fd588bfe9b6529f690d24297a54b
+++ packages/eglibc/eglibc-initial.inc 9cc9a816e903fd588bfe9b6529f690d24297a54b
@@ -0,0 +1,31 @@
+SECTION = "libs"
+DEPENDS = "linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+
+do_configure () {
+ sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
+ chmod +x ${S}/configure
+ CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" \
+ ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+ --without-cvs --disable-sanity-checks \
+ --with-headers=${STAGING_DIR_TARGET}${layout_includedir} \
+ --enable-hacker-mode
+}
+
+do_compile () {
+ :
+}
+
+do_stage () {
+ oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
+ includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers
+
+}
+
+do_install () {
+ :
+}
============================================================
--- packages/eglibc/eglibc-intermediate.inc 44c319922c41be728547bbcc0e10b47e1ac00e02
+++ packages/eglibc/eglibc-intermediate.inc 44c319922c41be728547bbcc0e10b47e1ac00e02
@@ -0,0 +1,12 @@
+SECTION = "libs"
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
+
+do_install () {
+ :
+}
+
+GLIBC_ADDONS = "nptl,ports"
+GLIBC_EXTRA_OECONF = ""
============================================================
--- packages/eglibc/eglibc-stage.inc 4cabc49eb0552ed4b7a83649bacd02dec1d6307c
+++ packages/eglibc/eglibc-stage.inc 4cabc49eb0552ed4b7a83649bacd02dec1d6307c
@@ -0,0 +1,21 @@
+do_stage() {
+ rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
+ oe_runmake 'install_root=${STAGING_DIR_HOST}' \
+ 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
+ '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
+ install-headers install-lib install
+
+ 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_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
+ done
+}
============================================================
--- packages/eglibc/eglibc.inc 20ecb0b8894a6fa79214db154c8cd4e8458d7237
+++ packages/eglibc/eglibc.inc 20ecb0b8894a6fa79214db154c8cd4e8458d7237
@@ -0,0 +1,22 @@
+DESCRIPTION = "Embedded GNU C Library"
+HOMEPAGE = "http://www.eglibc.org/home"
+SECTION = "libs"
+PRIORITY = "required"
+LICENSE = "LGPL"
+# 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"
+# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
+RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES += "virtual/libintl virtual/libiconv"
+
+inherit autotools
+
+LEAD_SONAME = "libc.so"
+
+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"
============================================================
--- packages/eglibc/files/etc/ld.so.conf f121cfac68db7d77f815ba3ae19f4d0e9d71e9a9
+++ packages/eglibc/files/etc/ld.so.conf f121cfac68db7d77f815ba3ae19f4d0e9d71e9a9
@@ -0,0 +1,2 @@
+/usr/local/lib
+/usr/X11R6/lib
============================================================
--- packages/eglibc/files/generate-supported.mk f3b671988f6b2f0dea05190d24dbadfa147f6b6d
+++ packages/eglibc/files/generate-supported.mk f3b671988f6b2f0dea05190d24dbadfa147f6b6d
@@ -0,0 +1,11 @@
+#!/usr/bin/make
+
+include $(IN)
+
+all:
+ rm -f $(OUT)
+ touch $(OUT)
+ for locale in $(SUPPORTED-LOCALES); do \
+ [ $$locale = true ] && continue; \
+ echo $$locale | sed 's,/, ,' >> $(OUT); \
+ done
============================================================
--- packages/glibc/eglibc-initial_svn.bb d2d1ddf74dfda515dc592de07fd2510121c8f2af
+++ packages/eglibc/eglibc-initial_svn.bb a4c9652d0de37ac0abfcd55c52adce25ff66084c
@@ -1,48 +1,6 @@ require eglibc_${PV}.bb
require eglibc_${PV}.bb
+require eglibc-initial.inc
-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 = ""
-PACKAGES_DYNAMIC = ""
-
-do_configure () {
- sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
- chmod +x ${S}/configure
- unset CFLAGS
- find ${S} -name "configure" | xargs touch
- CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
- --without-cvs --disable-sanity-checks \
- --with-headers=${STAGING_INCDIR} \
- --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_configure_prepend () {
+ unset CFLAGS
}
-
-do_compile () {
- :
-}
-
-do_stage () {
- oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir=${layout_includedir} 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 ${STAGING_INCDIR}/gnu
- touch ${STAGING_INCDIR}/gnu/stubs.h
- cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
-}
-
-do_install () {
- :
-}
============================================================
--- packages/glibc/eglibc-intermediate_svn.bb 21404b0d7ead89e15d711d84009c0873dddf6ade
+++ packages/eglibc/eglibc-intermediate_svn.bb f9887693f966ca7f4608681ee51e4c19f3c063e0
@@ -1,20 +1,8 @@ require eglibc_${PV}.bb
require eglibc_${PV}.bb
+require eglibc-intermediate.inc
-do_install () {
- :
-}
-
# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
do_configure_prepend() {
find ${S} -name "configure" | xargs touch
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 = ""
============================================================
--- packages/glibc/eglibc-package.bbclass aee684fa0a585cebef668deddd667baf05049150
+++ packages/eglibc/eglibc-package.bbclass 4c8a14b11d10890e3bf7171190c5e5734ae40101
@@ -27,7 +27,7 @@ PACKAGES = "eglibc-dbg eglibc catchsegv
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 = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*"
RPROVIDES_eglibc = "glibc"
RPROVIDES_eglibc-utils = "glibc-utils"
@@ -36,7 +36,8 @@ RPROVIDES_eglibc-thread-db = "glibc-thre
RPROVIDES_eglibc-locale = "glibc-locale"
RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
RPROVIDES_eglibc-thread-db = "glibc-thread-db"
-RPROVIDES_eglibc-pcprofiles = "glibc-pcprofiles"
+RPROVIDES_eglibc-pcprofile = "glibc-pcprofile"
+RPROVIDES_eglibc-dbg = "glibc-dbg"
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*"
@@ -49,7 +50,7 @@ FILES_eglibc-gconv = "${libdir}/gconv/*"
FILES_nscd = "${sbindir}/nscd*"
FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
FILES_eglibc-gconv = "${libdir}/gconv/*"
-FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug"
+FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug"
FILES_catchsegv = "${bindir}/catchsegv"
RDEPENDS_catchsegv = "libsegfault"
FILES_eglibc-pcprofile = "/lib/libpcprofile.so"
============================================================
--- packages/glibc/eglibc_svn.bb 693cfbc95cb7166e12ced9da2affddab022ac474
+++ packages/eglibc/eglibc_svn.bb cfab52709e02a2130813453bf1ecea896dc28a6b
@@ -1,12 +1,10 @@
-require glibc.inc
+require eglibc.inc
-DEFAULT_PREFERENCE = "-1"
+# DEFAULT_PREFERENCE = "-1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
PV = "2.8+svnr${SRCREV}"
PR = "r6"
SRC_URI = "svn://svn.eglibc.org;module=trunk \
- file://eglibc-svn-arm-cargs6.patch;patch=1 \
- file://eglibc-svn-arm-check_pf.patch;patch=1 \
file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
file://etc/ld.so.conf \
file://generate-supported.mk"
@@ -15,6 +13,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev"
+PROVIDES_${PN}-dbg = "glibc-dbg"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
@@ -93,6 +92,6 @@ do_compile () {
)
}
-require glibc-stage.inc
+require eglibc-stage.inc
require eglibc-package.bbclass
More information about the Openembedded-commits
mailing list