[oe-commits] org.oe.dev merge of '1d466223051b440fb06aab1ad59b32e9d6327361'

koen commit openembedded-commits at lists.openembedded.org
Sun Aug 12 10:09:09 UTC 2007


merge of '1d466223051b440fb06aab1ad59b32e9d6327361'
     and 'fd98012fea1d4da46fcc95cf50ac457d7c7f1023'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: cb36f918316000d589c2b21eed21c97d330ef4c8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cb36f918316000d589c2b21eed21c97d330ef4c8
Files:
1
classes/package_deb.bbclass
classes/package_ipk.bbclass
packages/gcc/gcc-cross-initial_4.2.1.bb
packages/uclibc/uclibc-0.9.29/bfin/uClibc.config
packages/uclibc/uclibc-0.9.29/bfin/uClibc.distro
packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine
Diffs:

#
# mt diff -r1d466223051b440fb06aab1ad59b32e9d6327361 -rcb36f918316000d589c2b21eed21c97d330ef4c8
#
# 
# 
# patch "classes/package_deb.bbclass"
#  from [2d8ea35906dd1ccfce507dbc0f44fdb6ed2335ec]
#    to [e921fa8625c039aae270b843336c64fbd0a5dbf2]
# 
# patch "classes/package_ipk.bbclass"
#  from [f94dda286b2ddbbb067587e2698b5115a7479f86]
#    to [115710babe1d2cc095e515f58f4593c548e5b72b]
# 
============================================================
--- classes/package_deb.bbclass	2d8ea35906dd1ccfce507dbc0f44fdb6ed2335ec
+++ classes/package_deb.bbclass	e921fa8625c039aae270b843336c64fbd0a5dbf2
@@ -130,7 +130,7 @@ python do_package_deb () {
             del g[g.index('./DEBIAN')]
         except ValueError:
             pass
-        if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
+        if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
             from bb import note
             note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
             continue
============================================================
--- classes/package_ipk.bbclass	f94dda286b2ddbbb067587e2698b5115a7479f86
+++ classes/package_ipk.bbclass	115710babe1d2cc095e515f58f4593c548e5b72b
@@ -131,7 +131,7 @@ python do_package_ipk () {
 			del g[g.index('./CONTROL')]
 		except ValueError:
 			pass
-		if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
+		if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
 			from bb import note
 			note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
 			continue


#
# mt diff -rfd98012fea1d4da46fcc95cf50ac457d7c7f1023 -rcb36f918316000d589c2b21eed21c97d330ef4c8
#
# 
# 
# add_file "packages/gcc/gcc-cross-initial_4.2.1.bb"
#  content [7820cd16078d41cfc1e61af5ec45f1fbe7835156]
# 
# add_file "packages/uclibc/uclibc-0.9.29/bfin/uClibc.config"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/uclibc/uclibc-0.9.29/bfin/uClibc.distro"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# patch "packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine"
#  from [85148d879b9b4e58de20ec2349c204d06e87ef51]
#    to [39526ec7c7f496de4a427ff4a8ba8f5b8dd7425c]
# 
============================================================
--- packages/gcc/gcc-cross-initial_4.2.1.bb	7820cd16078d41cfc1e61af5ec45f1fbe7835156
+++ packages/gcc/gcc-cross-initial_4.2.1.bb	7820cd16078d41cfc1e61af5ec45f1fbe7835156
@@ -0,0 +1,30 @@
+require gcc-cross_${PV}.bb
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
+PACKAGES = ""
+
+# This is intended to be a -very- basic config
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		--with-newlib \
+		--disable-shared \
+		--disable-threads \
+		--disable-multilib \
+		--disable-__cxa_atexit \
+		--disable-libmudflap \
+		--disable-libssp \
+		--enable-languages=c \
+		--enable-target-optspace \
+		--program-prefix=${TARGET_PREFIX} \
+		${@get_gcc_fpu_setting(bb, d)}"
+
+do_stage_prepend () {
+	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
+	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
+}
+
+# Override the method from gcc-cross so we don't try to install libgcc
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+}
============================================================
--- packages/uclibc/uclibc-0.9.29/bfin/uClibc.config	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/uclibc/uclibc-0.9.29/bfin/uClibc.config	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/uclibc/uclibc-0.9.29/bfin/uClibc.distro	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/uclibc/uclibc-0.9.29/bfin/uClibc.distro	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine	85148d879b9b4e58de20ec2349c204d06e87ef51
+++ packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine	39526ec7c7f496de4a427ff4a8ba8f5b8dd7425c
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Mon Jun 11 14:03:30 2007
+# Fri Aug 10 19:05:32 2007
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -51,8 +51,126 @@ DO_C99_MATH=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
-KERNEL_HEADERS="/usr/include"
-UCLIBC_UCLINUX_BROKEN_MUNMAP=y
+KERNEL_HEADERS="/media/hda4/OE/build/tmp-new/angstrom/cross/bfin-angstrom-uclinux-uclibc/include"
+# UCLIBC_UCLINUX_BROKEN_MUNMAP is not set
 EXCLUDE_BRK=y
 HAVE_DOT_CONFIG=y
 
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+# DOPIC is not set
+HAVE_NO_SHARED=y
+ARCH_HAS_NO_LDSO=y
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+# UCLIBC_HAS_THREADS is not set
+UCLIBC_HAS_LFS=y
+MALLOC=y
+# MALLOC_SIMPLE is not set
+# MALLOC_STANDARD is not set
+# MALLOC_GLIBC_COMPAT is not set
+UCLIBC_DYNAMIC_ATEXIT=y
+# COMPAT_ATEXIT is not set
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+# UCLIBC_HAS_SHADOW is not set
+# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+# UCLIBC_HAS_TZ_CACHING is not set
+# UCLIBC_HAS_TZ_FILE is not set
+
+#
+# Networking Support
+#
+# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+# UCLIBC_USE_NETLINK is not set
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+UCLIBC_HAS_CTYPE_UNSAFE=y
+# UCLIBC_HAS_CTYPE_CHECKED is not set
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
+# UCLIBC_HAS_PRINTF_M_SPEC is not set
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+# UCLIBC_HAS_WORDEXP is not set
+# UCLIBC_HAS_FTW is not set
+UCLIBC_HAS_GLOB=y
+# UCLIBC_HAS_GNU_GLOB is not set
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="//usr"
+MULTILIB=""
+
+#
+# Security options
+#
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+# UCLIBC_BUILD_NOEXECSTACK is not set
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX="bfin-elf-"
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DOSTRIP is not set
+# DOASSERTS is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set






More information about the Openembedded-commits mailing list