More fixes per seperator change.

BKrev: 3f8c6656MFPMVnm7SgylaeVMS381Eg

diff --git a/autoconf/autoconf-native_2.57.oe b/autoconf/autoconf-native_2.57.oe
index e69de29..76dd7a8 100644 (file)
--- a/autoconf/autoconf-native_2.57.oe
+++ b/autoconf/autoconf-native_2.57.oe
@@ -0,0 +1,4 @@
+include autoconf_${PV}.oe
+S = ${WORKDIR}/autoconf-${PV}
+
+inherit native

diff --git a/automake/automake-native_1.7.7.oe b/automake/automake-native_1.7.7.oe
index e69de29..ae93294 100644 (file)
--- a/automake/automake-native_1.7.7.oe
+++ b/automake/automake-native_1.7.7.oe
@@ -0,0 +1,4 @@
+include automake_${PV}.oe
+S = ${WORKDIR}/automake-${PV}
+
+inherit native

diff --git a/binutils/binutils-cross_2.14.90.0.6.oe b/binutils/binutils-cross_2.14.90.0.6.oe
index e69de29..f7cde6b 100644 (file)
--- a/binutils/binutils-cross_2.14.90.0.6.oe
+++ b/binutils/binutils-cross_2.14.90.0.6.oe
@@ -0,0 +1,4 @@
+include binutils_${PV}.oe
+inherit cross
+PROVIDES = virtual/${TARGET_SYS}-binutils
+FILESDIR = ${TOPDIR}/binutils/binutils-${PV}

diff --git a/binutils/binutils-uclibc-cross_2.14.90.0.6.oe b/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
index e69de29..f91bbb7 100644 (file)
--- a/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
+++ b/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
@@ -0,0 +1,4 @@
+include binutils-uclibc_${PV}.oe
+inherit cross
+PROVIDES = virtual/${TARGET_SYS}-binutils
+FILESDIR = ${TOPDIR}/binutils/binutils-${PV}

diff --git a/binutils/binutils-uclibc_2.14.90.0.6.oe b/binutils/binutils-uclibc_2.14.90.0.6.oe
index e69de29..711e4ce 100644 (file)
--- a/binutils/binutils-uclibc_2.14.90.0.6.oe
+++ b/binutils/binutils-uclibc_2.14.90.0.6.oe
@@ -0,0 +1,13 @@
+include binutils_${PV}.oe
+FILESDIR = ${TOPDIR}/binutils/binutils-${PV}
+
+binutilsbuild_do_patch () {
+       oenote IN binutils patch
+       perl -i -p -e 's,#.*define.*ELF_DYNAMIC_INTERPRETER.*".*",#define ELF_DYNAMIC_INTERPRETER "/lib/ld-uClibc.so.0",;' `grep -lr ELF_DYNAMIC_INTERPRETER *`
+}
+
+python do_patch () {
+       oe.build.exec_func('base_do_patch', d)
+       oe.build.exec_func('binutilsbuild_do_patch', d)
+}
+

diff --git a/fakeroot/fakeroot-native_0.7.5.oe b/fakeroot/fakeroot-native_0.7.5.oe
index e69de29..67326bb 100644 (file)
--- a/fakeroot/fakeroot-native_0.7.5.oe
+++ b/fakeroot/fakeroot-native_0.7.5.oe
@@ -0,0 +1,3 @@
+inherit native
+include fakeroot_${PV}.oe
+S = ${WORKDIR}/fakeroot-${PV}

diff --git a/gcc/gcc-cross_3.3.1.oe b/gcc/gcc-cross_3.3.1.oe
index e69de29..bb6c572 100644 (file)
--- a/gcc/gcc-cross_3.3.1.oe
+++ b/gcc/gcc-cross_3.3.1.oe
@@ -0,0 +1,52 @@
+inherit cross
+include gcc_${PV}.oe
+
+DEPENDS := virtual/${TARGET_SYS}-binutils \
+           virtual/glibc virtual/glibc-headers patcher
+PROVIDES := virtual/${TARGET_SYS}-gcc \
+            virtual/${TARGET_SYS}-g++
+
+PACKAGES =
+
+EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/usr/local \
+                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+                --enable-target-optspace \
+                --with-gnu-ld \
+                --enable-languages=c,c++ \
+                --enable-shared \
+                --enable-multilib \
+                --program-prefix=${TARGET_SYS}-
+
+export CPPFLAGS =
+export CXXFLAGS =
+export CFLAGS =
+export LDFLAGS =
+
+do_configure_prepend () {
+       export CC="${BUILD_CC}"
+       export AR="${TARGET_SYS}-ar"
+       export RANLIB="${TARGET_SYS}-ranlib"
+       export LD="${TARGET_SYS}-ld"
+       export NM="${TARGET_SYS}-nm"
+}
+
+do_compile_prepend () {
+       export CC="${BUILD_CC}"
+       export AR_FOR_TARGET="${TARGET_SYS}-ar"
+       export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+       export LD_FOR_TARGET="${TARGET_SYS}-ld"
+       export NM_FOR_TARGET="${TARGET_SYS}-nm"
+       export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+}
+
+do_stage_append () {
+#      # Cleanup after gcc's --program-prefix failing..
+#      ( cd ${CROSS_DIR}/bin ; for p in ${TARGET_SYS}-* ; do
+#              mv $p `echo $p | sed -e s,${TARGET_SYS},${TARGET_ARCH}-uclibc,`
+#      done )
+
+       rm -f ${CROSS_DIR}/bin/gccbug ${CROSS_DIR}/bin/gcov
+       for d in info man share/doc share/locale ; do
+               rm -rf ${CROSS_DIR}/$d
+       done
+}

diff --git a/gcc/gcc-initial-cross_3.3.1.oe b/gcc/gcc-initial-cross_3.3.1.oe
index e69de29..54c1004 100644 (file)
--- a/gcc/gcc-initial-cross_3.3.1.oe
+++ b/gcc/gcc-initial-cross_3.3.1.oe
@@ -0,0 +1,15 @@
+include gcc-cross_${PV}.oe
+
+DEPENDS := virtual/${TARGET_SYS}-binutils \
+           virtual/glibc-headers patcher
+PROVIDES := virtual/${TARGET_SYS}-gcc-initial
+
+EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/usr/local \
+                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+                --enable-target-optspace \
+                --disable-nls \
+                --with-gnu-ld \
+                --enable-languages=c \
+                --disable-shared \
+                --enable-multilib \
+                --program-prefix=${TARGET_SYS}-

diff --git a/gcc/gcc-initial-uclibc-cross_3.3.1.oe b/gcc/gcc-initial-uclibc-cross_3.3.1.oe
index e69de29..8ed3f74 100644 (file)
--- a/gcc/gcc-initial-uclibc-cross_3.3.1.oe
+++ b/gcc/gcc-initial-uclibc-cross_3.3.1.oe
@@ -0,0 +1,16 @@
+include gcc-uclibc-cross_${PV}.oe
+
+DEPENDS := virtual/${TARGET_SYS}-binutils \
+           virtual/uclibc-headers patcher
+PROVIDES := virtual/${TARGET_SYS}-gcc-initial
+
+EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/usr/local \
+                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+                --enable-target-optspace \
+                --disable-nls \
+                --with-gnu-ld \
+                --disable-__cxa_atexit \
+                --enable-languages=c \
+                --disable-shared \
+                --enable-multilib \
+                --program-prefix=${TARGET_SYS}-

diff --git a/gcc/gcc-uclibc-cross_3.3.1.oe b/gcc/gcc-uclibc-cross_3.3.1.oe
index e69de29..703c1b9 100644 (file)
--- a/gcc/gcc-uclibc-cross_3.3.1.oe
+++ b/gcc/gcc-uclibc-cross_3.3.1.oe
@@ -0,0 +1,54 @@
+inherit cross
+include gcc-uclibc_${PV}.oe
+
+DEPENDS := virtual/${TARGET_SYS}-binutils \
+           virtual/uclibc virtual/uclibc-headers patcher
+PROVIDES := virtual/${TARGET_SYS}-gcc \
+            virtual/${TARGET_SYS}-g++
+
+PACKAGES =
+
+EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/usr/local \
+                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+                --enable-target-optspace \
+                --disable-nls \
+                --with-gnu-ld \
+                --disable-__cxa_atexit \
+                --enable-languages=c,c++ \
+                --enable-shared \
+                --enable-multilib \
+                --program-prefix=${TARGET_SYS}-
+
+export CPPFLAGS =
+export CXXFLAGS =
+export CFLAGS =
+export LDFLAGS =
+
+do_configure_prepend () {
+       export CC="${BUILD_CC}"
+       export AR="${TARGET_SYS}-ar"
+       export RANLIB="${TARGET_SYS}-ranlib"
+       export LD="${TARGET_SYS}-ld"
+       export NM="${TARGET_SYS}-nm"
+}
+
+do_compile_prepend () {
+       export CC="${BUILD_CC}"
+       export AR_FOR_TARGET="${TARGET_SYS}-ar"
+       export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+       export LD_FOR_TARGET="${TARGET_SYS}-ld"
+       export NM_FOR_TARGET="${TARGET_SYS}-nm"
+       export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+}
+
+do_stage_append () {
+#      # Cleanup after gcc's --program-prefix failing..
+#      ( cd ${CROSS_DIR}/bin ; for p in ${TARGET_SYS}-* ; do
+#              mv $p `echo $p | sed -e s,${TARGET_SYS},${TARGET_ARCH}-uclibc,`
+#      done )
+
+       rm -f ${CROSS_DIR}/bin/gccbug ${CROSS_DIR}/bin/gcov
+       for d in info man share/doc share/locale ; do
+               rm -rf ${CROSS_DIR}/$d
+       done
+}

diff --git a/gcc/gcc-uclibc_3.3.1.oe b/gcc/gcc-uclibc_3.3.1.oe
index e69de29..20ecd86 100644 (file)
--- a/gcc/gcc-uclibc_3.3.1.oe
+++ b/gcc/gcc-uclibc_3.3.1.oe
@@ -0,0 +1,46 @@
+include gcc_${PV}.oe
+FILESDIR=${TOPDIR}/gcc/gcc-${PV}
+
+gccbuild_do_patch () {
+       #
+       # Hack things to use the correct shared lib loader
+       #
+       LIST=`grep -lr -- "-dynamic-linker.*\.so[\.0-9]*" .`
+       if [ -n "$LIST" ] ; then
+               perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},-dynamic-linker /lib/ld-uClibc.so.0},;" $LIST
+       fi
+
+       #
+       # Prevent system glibc start files from leaking in uninvited...
+       #
+       perl -i -p -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 = \"${CROSS_DIR}/${TARGET_SYS}/lib/\";,;" gcc/gcc.c
+       perl -i -p -e "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 = \"${CROSS_DIR}/${TARGET_SYS}/usr/lib/\";,;" gcc/gcc.c
+
+       #
+       # Prevent system glibc include files from leaking in uninvited...
+       #
+       perl -i -p -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=${CROSS_DIR}/${TARGET_SYS}/include,;" gcc/Makefile.in
+       perl -i -p -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=${CROSS_DIR}/${TARGET_SYS}/include,;" gcc/Makefile.in
+       perl -i -p -e "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \"${CROSS_DIR}/${TARGET_SYS}/include\",;" gcc/cppdefault.h
+
+       #
+       # Prevent system glibc libraries from being found by collect2 
+       # when it calls locatelib() and rummages about the system looking 
+       # for libraries with the correct name...
+       #
+       perl -i -p -e "s,\"/lib,\"${CROSS_DIR}/${TARGET_SYS}/lib,g;" \
+               gcc/collect2.c
+       perl -i -p -e "s,\"/usr/,\"${CROSS_DIR}/${TARGET_SYS}/usr/,g;" \
+               gcc/collect2.c
+
+       #
+       # Prevent gcc from using the unwind-dw2-fde-glibc code
+       #
+       perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc\n#ifndef inhibit_libc,g;" gcc/unwind-dw2-fde-glibc.c
+}
+
+python do_patch () {
+       oe.build.exec_func('base_do_patch', d)
+       oe.build.exec_func('gccbuild_do_patch', d)
+}
+

diff --git a/genext2fs/genext2fs-native_1.3.oe b/genext2fs/genext2fs-native_1.3.oe
index e69de29..3466839 100644 (file)
--- a/genext2fs/genext2fs-native_1.3.oe
+++ b/genext2fs/genext2fs-native_1.3.oe
@@ -0,0 +1,11 @@
+include genext2fs_${PV}.oe
+inherit native
+FILESDIR = ${TOPDIR}/genext2fs/genext2fs-${PV}
+
+do_stage () {
+       install -m 0755 genext2fs ${STAGING_BINDIR}/
+}
+
+do_install () {
+       true
+}

diff --git a/ipkg-utils/ipkg-utils-native_1.0_cvs.oe b/ipkg-utils/ipkg-utils-native_1.0_cvs.oe
index e69de29..b2f8e91 100644 (file)
--- a/ipkg-utils/ipkg-utils-native_1.0_cvs.oe
+++ b/ipkg-utils/ipkg-utils-native_1.0_cvs.oe
@@ -0,0 +1,2 @@
+inherit native
+include ipkg-utils_${PV}.oe

diff --git a/ipkg/ipkg-native_0.99.84.oe b/ipkg/ipkg-native_0.99.84.oe
index e69de29..6501307 100644 (file)
--- a/ipkg/ipkg-native_0.99.84.oe
+++ b/ipkg/ipkg-native_0.99.84.oe
@@ -0,0 +1,2 @@
+inherit native
+include ipkg_${PV}.oe

diff --git a/ipkg/ipkg-native_0.99.91.oe b/ipkg/ipkg-native_0.99.91.oe
index e69de29..6501307 100644 (file)
--- a/ipkg/ipkg-native_0.99.91.oe
+++ b/ipkg/ipkg-native_0.99.91.oe
@@ -0,0 +1,2 @@
+inherit native
+include ipkg_${PV}.oe

diff --git a/ipkg/ipkg-native_0.99.95.oe b/ipkg/ipkg-native_0.99.95.oe
index e69de29..6501307 100644 (file)
--- a/ipkg/ipkg-native_0.99.95.oe
+++ b/ipkg/ipkg-native_0.99.95.oe
@@ -0,0 +1,2 @@
+inherit native
+include ipkg_${PV}.oe

diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe
index e69de29..ac8f0ca 100644 (file)
--- a/libtool/libtool-cross_1.5.oe
+++ b/libtool/libtool-cross_1.5.oe
@@ -0,0 +1,31 @@
+include libtool_${PV}.oe
+#inherit cross
+SRC_URI_append = ' file://${FILESDIR}/libdir-la.patch;patch=1 \
+                  file://${FILESDIR}/sedvar.patch;patch=1 \
+                  file://${FILESDIR}/tag.patch;patch=1 \
+                  file://${FILESDIR}/libtoolize-staging.patch;patch=1 \
+                  file://${FILESDIR}/prefix.patch;patch=1 \
+                  file://${FILESDIR}/chmod.patch;patch=1'
+S = ${WORKDIR}/libtool-${PV}
+FILESDIR = ${TOPDIR}/libtool/libtool-${PV}
+
+prefix=${CROSS_DIR}
+exec_prefix=${prefix}
+
+EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-"
+
+do_stage () {
+       oe_runmake install
+       install -d ${STAGING_DIR}/share/{libtool,aclocal}
+       install -m 0755 ${CROSS}libtool ${STAGING_BINDIR}/${CROSS}libtool
+       install -m 0755 libtoolize ${STAGING_BINDIR}/${CROSS}libtoolize
+       install -c config.guess ${STAGING_DIR}/share/libtool/${CROSS}config.guess
+       install -c config.sub ${STAGING_DIR}/share/libtool/${CROSS}config.sub
+       install -c -m 0644 ltmain.sh ${STAGING_DIR}/share/libtool/
+       install -c -m 0644 libtool.m4 ${STAGING_DIR}/share/aclocal/
+       install -c -m 0644 ltdl.m4 ${STAGING_DIR}/share/aclocal/
+}
+
+do_install () {
+       true
+}

diff --git a/pkgconfig/pkgconfig-native_0.15.0.oe b/pkgconfig/pkgconfig-native_0.15.0.oe
index e69de29..5414129 100644 (file)
--- a/pkgconfig/pkgconfig-native_0.15.0.oe
+++ b/pkgconfig/pkgconfig-native_0.15.0.oe
@@ -0,0 +1,4 @@
+include pkgconfig_${PV}.oe
+inherit native
+FILESDIR=${TOPDIR}/pkgconfig/pkgconfig-${PV}
+S=${WORKDIR}/pkgconfig-${PV}

diff --git a/uclibc/uclibc-initial_0.9.21.oe b/uclibc/uclibc-initial_0.9.21.oe
index e69de29..92fe6b8 100644 (file)
--- a/uclibc/uclibc-initial_0.9.21.oe
+++ b/uclibc/uclibc-initial_0.9.21.oe
@@ -0,0 +1,27 @@
+include uclibc_${PV}.oe
+
+DEPENDS :=
+PROVIDES := virtual/uclibc-headers
+
+PACKAGES =
+
+do_stage() {
+       make install_dev
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+       ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+       mkdir -p ${CROSS_DIR}/lib/gcc-lib
+       mkdir -p ${CROSS_DIR}/usr/lib
+       cd ${CROSS_DIR}/usr/lib
+       ln -sf ../../lib/gcc-lib
+}
+
+do_install() {
+       true
+}
+
+do_compile () {
+       true
+}
+