Moved the emptying of EXTRA_OEMAKE into autotools.oeclass where it belongs.

BKrev: 3f70cd40KX6mTFwxQVi3H0OLTY_bRA

19 files changed, 20 insertions, 23 deletions

diff --git a/content/coreutils-5.0.oe b/content/coreutils-5.0.oe
index e69de29bb2..7aa6955861 100644
--- a/content/coreutils-5.0.oe
+++ b/content/coreutils-5.0.oe
@@ -0,0 +1,8 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = ${GNU_MIRROR}/${PN}/${P}.tar.gz \
+	  file://${FILESDIR}/malloc.patch;patch=1
+S = ${WORKDIR}/${P}
+
+inherit autotools
diff --git a/content/corkscrew-2.0.oe b/content/corkscrew-2.0.oe
index b00c076af4..198dfd35b8 100644
--- a/content/corkscrew-2.0.oe
+++ b/content/corkscrew-2.0.oe
@@ -2,5 +2,3 @@ SRC_URI := http://www.agroman.net/${PN}/${P}.tar.gz
 S := ${WORKDIR}/${P}
 
 inherit autotools
-
-EXTRA_OEMAKE=
diff --git a/content/cross-binutils-2.13.2.oe b/content/cross-binutils-2.13.2.oe
index 9d91236392..87bd531472 100644
--- a/content/cross-binutils-2.13.2.oe
+++ b/content/cross-binutils-2.13.2.oe
@@ -12,5 +12,3 @@ CROSS_DIR := ${CROSS_DIR}
 prefix=${CROSS_DIR}
 exec_prefix=${prefix}
 inherit cross autotools
-
-EXTRA_OEMAKE =
diff --git a/content/cross-binutils-2.14.90.0.6.oe b/content/cross-binutils-2.14.90.0.6.oe
index 68f0ee115c..fa0fef3aa5 100644
--- a/content/cross-binutils-2.14.90.0.6.oe
+++ b/content/cross-binutils-2.14.90.0.6.oe
@@ -7,5 +7,3 @@ CROSS_DIR := ${CROSS_DIR}
 prefix=${CROSS_DIR}
 exec_prefix=${prefix}
 inherit cross autotools
-
-EXTRA_OEMAKE =
diff --git a/content/cross-binutils-2.14.oe b/content/cross-binutils-2.14.oe
index 71a5eaef9c..fbc992e85e 100644
--- a/content/cross-binutils-2.14.oe
+++ b/content/cross-binutils-2.14.oe
@@ -12,5 +12,3 @@ CROSS_DIR := ${CROSS_DIR}
 prefix=${CROSS_DIR}
 exec_prefix=${prefix}
 inherit cross autotools
-
-EXTRA_OEMAKE =
diff --git a/content/cross-gcc-3.3.1.oe b/content/cross-gcc-3.3.1.oe
index 4915a13f54..1bf2d144cb 100644
--- a/content/cross-gcc-3.3.1.oe
+++ b/content/cross-gcc-3.3.1.oe
@@ -8,7 +8,6 @@ prefix=${CROSS_DIR}
 exec_prefix=${prefix}
 inherit cross autotools
 
-EXTRA_OEMAKE =
 EXTRA_OECONF = --oldincludedir=${prefix}/include --enable-shared \
 	       --with-gxx-include-dir=${CROSS_DIR}/include/c++ \
 	       --enable-shared \
diff --git a/content/diffutils-2.8.1.oe b/content/diffutils-2.8.1.oe
index ec577a2c0f..dadfaf94fd 100644
--- a/content/diffutils-2.8.1.oe
+++ b/content/diffutils-2.8.1.oe
@@ -5,5 +5,3 @@ SRC_URI = ${GNU_MIRROR}/${PN}/${P}.tar.gz
 S = ${WORKDIR}/${P}
 
 inherit autotools
-
-EXTRA_OEMAKE = 
diff --git a/content/glibc-2.3.2.oe b/content/glibc-2.3.2.oe
index bda444cfbf..8392a5c8cc 100644
--- a/content/glibc-2.3.2.oe
+++ b/content/glibc-2.3.2.oe
@@ -69,7 +69,6 @@ builddir="${WORKDIR}/build-${TARGET_SYS}"
 inherit autotools
 
 EXTRA_OECONF="--with-elf --disable-profile --enable-add-ons=linuxthreads --with-elf --enable-shared --with-headers=${WORKDIR}/linux/include --without-cvs --enable-kernel=2.4.6"
-EXTRA_OEMAKE=
 
 glibcbuild_do_unpack () {
 	mv "${WORKDIR}/linuxthreads" "${WORKDIR}/linuxthreads_db" "${S}/"
diff --git a/content/libogg-1.0.0.oe b/content/libogg-1.0.0.oe
index e69de29bb2..993948253d 100644
--- a/content/libogg-1.0.0.oe
+++ b/content/libogg-1.0.0.oe
@@ -0,0 +1,12 @@
+SECTION="libs"
+PRIORITY="optional"
+MAINTAINER=""
+RDEPENDS="libc6"
+SECTION="libs"
+DEPENDS=virtual/libc patcher
+
+SRC_URI = "ftp://ftp.debian.org/debian/pool/main/libo/libogg/${PN}_${PV}.orig.tar.gz"
+SRC_URI_append = " file://${FILESDIR}/libogg-configure.patch;patch=1"
+S=${WORKDIR}/${P}
+
+inherit autotools
diff --git a/content/libtool-1.4.3.oe b/content/libtool-1.4.3.oe
index 52643ab6b3..f04e943c8d 100644
--- a/content/libtool-1.4.3.oe
+++ b/content/libtool-1.4.3.oe
@@ -21,7 +21,6 @@ S = "${WORKDIR}/${P}"
 inherit autotools
 
 EXTRA_OECONF = --disable-ltdl-install
-EXTRA_OEMAKE =
 do_configure_prepend () {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC CPP
 	./bootstrap
diff --git a/content/modutils-2.4.25.oe b/content/modutils-2.4.25.oe
index a6caef4499..ef217644de 100644
--- a/content/modutils-2.4.25.oe
+++ b/content/modutils-2.4.25.oe
@@ -5,5 +5,4 @@ S = ${WORKDIR}/${P}
 inherit autotools
 
 EXTRA_OECONF = --disable-strip
-EXTRA_OEMAKE =
 export BUILDCC = ${BUILD_CC}
diff --git a/content/mtd.oe b/content/mtd.oe
index 467a884dd1..78b7c4d62f 100644
--- a/content/mtd.oe
+++ b/content/mtd.oe
@@ -3,7 +3,6 @@ PV = ${@os.popen("date +%Y%m%d").readline().strip()}
 S = ${WORKDIR}/mtd/util
 SRC_URI = cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd
 
-#EXTRA_OEMAKE_append = " util"
 CFLAGS_prepend = "-I${S}/../include "
 CPPFLAGS_prepend = "-I${S}/../include "
 CXXFLAGS_prepend = "-I${S}/../include "
diff --git a/content/ncurses-4.2.oe b/content/ncurses-4.2.oe
index b2821dfb8e..a4ab4bee47 100644
--- a/content/ncurses-4.2.oe
+++ b/content/ncurses-4.2.oe
@@ -19,7 +19,6 @@ EXTRA_OECONF=--with-shared \
 	     --without-cxx-binding \
 	     --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo \
 	     --enable-overwrite
-EXTRA_OEMAKE = 
 export HOSTCCFLAGS=-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}
 export HOSTLDFLAGS=
 export LD := ${CC}
diff --git a/content/ncurses-5.3.oe b/content/ncurses-5.3.oe
index 408fd15174..38fb4aee96 100644
--- a/content/ncurses-5.3.oe
+++ b/content/ncurses-5.3.oe
@@ -24,7 +24,6 @@ EXTRA_OECONF=--with-shared \
 	     --without-cxx-binding \
 	     --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo \
 	     --enable-overwrite
-EXTRA_OEMAKE = 
 export BUILD_CC := ${BUILD_CC}
 export BUILD_CCFLAGS=-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}
 export BUILD_LDFLAGS=
diff --git a/content/ntp-4.1.2.oe b/content/ntp-4.1.2.oe
index d66287d7a2..928b1209fa 100644
--- a/content/ntp-4.1.2.oe
+++ b/content/ntp-4.1.2.oe
@@ -5,7 +5,6 @@ S = ${WORKDIR}/${P}
 
 inherit autotools
 
-EXTRA_OEMAKE =
 EXTRA_OECONF = --with-openssl-libdir=${STAGING_LIBDIR} \
 	       --with-openssl-incdir=${STAGING_DIR}/target/include/openssl
 CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
diff --git a/content/openobex-1.0.0.oe b/content/openobex-1.0.0.oe
index 00a3bba5cb..e9f11c84cd 100644
--- a/content/openobex-1.0.0.oe
+++ b/content/openobex-1.0.0.oe
@@ -6,8 +6,6 @@ S = ${WORKDIR}/${P}
 
 inherit autotools
 
-EXTRA_OEMAKE =
-
 do_stage () {
 	install -m 0755 src/.libs/libopenobex* ${STAGING_LIBDIR}/
 	install -d ${STAGING_DIR}/target/include/openobex
diff --git a/content/openobex-apps-1.0.0.oe b/content/openobex-apps-1.0.0.oe
index cf66f11402..bb5b8e3402 100644
--- a/content/openobex-apps-1.0.0.oe
+++ b/content/openobex-apps-1.0.0.oe
@@ -6,7 +6,6 @@ S = ${WORKDIR}/${P}
 
 inherit autotools
 
-EXTRA_OEMAKE =
 EXTRA_OECONF = --disable-glibtest --with-glib-prefix=${STAGING_DIR}/target
 export OPENOBEX_CFLAGS=-I${STAGING_DIR}/target/include
 export OPENOBEX_CONFIG = ${STAGING_BINDIR}/openobex-config \
diff --git a/content/tslib.oe b/content/tslib.oe
index b882e3c6aa..5abd5cc5e5 100644
--- a/content/tslib.oe
+++ b/content/tslib.oe
@@ -12,7 +12,6 @@ S = ${WORKDIR}/${PN}
 
 inherit autotools
 
-EXTRA_OEMAKE=
 do_compile_prepend () {
 	./autogen.sh
 }
diff --git a/content/zsh-4.1.1.oe b/content/zsh-4.1.1.oe
index 9194f09a18..d42f7ea455 100644
--- a/content/zsh-4.1.1.oe
+++ b/content/zsh-4.1.1.oe
@@ -11,4 +11,3 @@ S="${WORKDIR}/${P}"
 inherit autotools
 
 EXTRA_OECONF = "--with-curses-terminfo"
-EXTRA_OEMAKE =