(no commit message)

diff --git a/bin/build/die b/bin/build/die
new file mode 100644 (file)
index 0000000..ecdbef9
--- /dev/null
+++ b/bin/build/die
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 1

diff --git a/bin/build/oe_runconf b/bin/build/oe_runconf
new file mode 100644 (file)
index 0000000..3244b01
--- /dev/null
+++ b/bin/build/oe_runconf
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+if [ "${PN}" != "libtool" ] && \
+   [ -e ${STAGING_DIR}/share/libtool/ltmain.sh ]; then
+       oenote "Installing our ltmain.sh..."
+       for lt in `find ${S} -name ltmain.sh`; do
+               install -m 0644 ${STAGING_DIR}/share/libtool/ltmain.sh $lt
+       done
+fi     
+if [ -x ${S}/configure ] ; then
+       test -z "${BUILD_SYS}" || EXTRA_OECONF="--build=${BUILD_SYS} ${EXTRA_OECONF}"
+       test -z "${TARGET_SYS}" || EXTRA_OECONF="--target=${TARGET_SYS} ${EXTRA_OECONF}"
+       ${S}/configure \
+           --host=${SYS} \
+           --prefix=${prefix} \
+           --exec_prefix=${exec_prefix} \
+           --bindir=${bindir} \
+           --sbindir=${sbindir} \
+           --libexecdir=${libexecdir} \
+           --datadir=${datadir} \
+           --sysconfdir=${sysconfdir} \
+           --sharedstatedir=${sharedstatedir} \
+           --localstatedir=${localstatedir} \
+           --libdir=${libdir} \
+           --includedir=${includedir} \
+           --oldincludedir=${oldincludedir} \
+           --infodir=${infodir} \
+           --mandir=${mandir} \
+               ${EXTRA_OECONF} \
+           "$@" || die "oeconf failed" 
+else
+       die "no configure script found"
+fi
+for lt in `find ${S} -name libtool`; do
+       mv $lt $lt.old && \
+       cat $lt.old | sed -e 's,^sys_lib_search_path_spec=.*,sys_lib_search_path_spec="",; s,^sys_lib_dlsearch_path_spec=.*,sys_lib_dlsearch_path_spec="",' > $lt
+       chmod 755 $lt
+done

diff --git a/bin/build/oe_runmake b/bin/build/oe_runmake
new file mode 100644 (file)
index 0000000..c10563c
--- /dev/null
+++ b/bin/build/oe_runmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
+       if [ x"$MAKE" = x ]; then MAKE=make; fi
+       oenote ${MAKE} ${EXTRA_OEMAKE} "$@"
+       ${MAKE} ${EXTRA_OEMAKE} "$@" || die "oemake failed"
+else
+       die "no Makefile found"
+fi

diff --git a/bin/oe/__init__.py b/bin/oe/__init__.py
index be24cef..e5a1855 100644 (file)
--- a/bin/oe/__init__.py
+++ b/bin/oe/__init__.py
@@ -1736,8 +1736,7 @@ def emit_env(o=sys.__stdout__, env = globals()["env"]):
        It is used by exec_shell_func().
        """
 
-       o.write('\nPATH="' + os.path.join(projectdir, 'bin/build') + ':${PATH}"\n')
-
+#      o.write('\nPATH="' + os.path.join(projectdir, 'bin/build') + ':${PATH}"\n')
 
        for s in env:
                if s == s.lower(): continue