[PATCH 00/14] fix/remove unrecognised options

[PATCH 00/14] fix/remove unrecognised options

[Robert Yang]

The following changes since commit 005af45191ded6185c618c708181b31281e43092:

  bitbake: fetch2: avoid printing "no checksum" error message twice (2013-12-22 14:29:13 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib robert/options
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/options

Robert Yang (14):
  flac: remove unrecognised options
  alsa-lib: remove unrecognised options
  tremor: remove unrecognised option
  dpkg: fix/remove unrecognised options
  libid3tag: remove unrecognised option
  gstreamer: fix unrecognised options
  gstreamer1.0: remove unrecognised options
  gstreamer1.0: remove unrecognised options
  bluez-hcidump: remove unrecognised options
  enchant: fix unrecognised option
  cups: remove unrecognised option
  wget: remove unrecognised option
  ghostscript: remove unrecognised option
  mesa-demos: fix unrecognised options

 meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb         |    2 --
 meta/recipes-devtools/dpkg/dpkg.inc                          |   10 +++++-----
 meta/recipes-extended/cups/cups.inc                          |    2 --
 meta/recipes-extended/ghostscript/ghostscript_9.07.bb        |    8 +++++---
 meta/recipes-extended/wget/wget.inc                          |    2 +-
 meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb               |    4 ++--
 meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb            |    2 +-
 meta/recipes-multimedia/flac/flac_1.2.1.bb                   |    4 ++--
 .../gstreamer/gstreamer1.0-plugins-base.inc                  |    2 --
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc           |    6 +++++-
 meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb       |    6 +++++-
 meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb       |    2 --
 meta/recipes-multimedia/tremor/tremor_20120314.bb            |    2 +-
 meta/recipes-support/enchant/enchant_1.6.0.bb                |    4 +++-
 14 files changed, 30 insertions(+), 26 deletions(-)

-- 
1.7.10.4

[PATCH 01/14] flac: remove unrecognised options

[Robert Yang]

Remove --disable-id3libtest and --without-id3lib which had been removed
from flac for many years, here is the log from flac:

  commit e31d9eb05cb82bd5f9cab1e6ad5295ddad22bcab
  Author: Josh Coalson <jcoalson@users.sourceforce.net>
  Date:   Tue Sep 28 00:23:57 2004 +0000

      remove id3 support from the plugins

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-multimedia/flac/flac_1.2.1.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/flac/flac_1.2.1.bb b/meta/recipes-multimedia/flac/flac_1.2.1.bb
index 7fd7a03..37c7a97 100644
--- a/meta/recipes-multimedia/flac/flac_1.2.1.bb
+++ b/meta/recipes-multimedia/flac/flac_1.2.1.bb
@@ -32,13 +32,13 @@ S = "${WORKDIR}/flac-${PV}"
 
 inherit autotools gettext
 
-EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
+EXTRA_OECONF = "--disable-oggtest \
                 --with-ogg-libraries=${STAGING_LIBDIR} \
                 --with-ogg-includes=${STAGING_INCDIR} \
                 --without-xmms-prefix \
                 --without-xmms-exec-prefix \
                 --without-libiconv-prefix \
-                --without-id3lib"
+                "
 
 EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "altivec", " --enable-altivec", " --disable-altivec", d)}"
 
-- 
1.7.10.4

[PATCH 02/14] alsa-lib: remove unrecognised options

[Robert Yang]

Remove --with-cards and --with-oss, they are never in alsa-lib, but in
alsa-driver, and the --with-cards had also been dropped from
alsa-driver.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb
index 0e1ea76..0087faf 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb
@@ -27,7 +27,7 @@ inherit autotools pkgconfig
 require alsa-fpu.inc
 EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
 
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
+EXTRA_OECONF = "--disable-python"
 
 EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no "
 
-- 
1.7.10.4

[PATCH 03/14] tremor: remove unrecognised option

[Robert Yang]

Remove the --disable-rpath, it seems taht there is never such an option
in tremor's configure, and it uses our libtool, so we don't have to
worry about the rpath.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-multimedia/tremor/tremor_20120314.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/tremor/tremor_20120314.bb b/meta/recipes-multimedia/tremor/tremor_20120314.bb
index d95fdf1..145316c 100644
--- a/meta/recipes-multimedia/tremor/tremor_20120314.bb
+++ b/meta/recipes-multimedia/tremor/tremor_20120314.bb
@@ -17,6 +17,6 @@ S = "${WORKDIR}/Tremor"
 
 inherit autotools
 
-EXTRA_OECONF=" --enable-shared --disable-rpath  "
+EXTRA_OECONF = "--enable-shared"
 
 ARM_INSTRUCTION_SET = "arm"
-- 
1.7.10.4

[PATCH 04/14] dpkg: fix/remove unrecognised options

[Robert Yang]

Fix/remove the following unrecognised options:
* --without-static-progs: can't find anything about this in the history,
  so remove it.
* --without-dselect -> --disable-dselect
* --with-start-stop-daemon -> --enable-start-stop-daemon
* --with-bz2lib, typo, should be --with-bz2
* --without-sgml-doc: the sgml doc had been removed from dpkg, so
  remove it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index b1da4fb..d5dc412 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -22,14 +22,14 @@ PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl"
 export PERL_LIBDIR = "${libdir}/perl"
 PERL_LIBDIR_class-native = "${libdir}/perl-native/perl"
 
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
+EXTRA_OECONF = "\
+		--disable-dselect \
+		--enable-start-stop-daemon \
 		--with-zlib \
-		--with-bz2lib \
+		--with-bz2 \
 		--without-liblzma \
 		--without-selinux \
-		--without-sgml-doc"
+		"
 
 do_configure () {
     echo >> ${S}/m4/compiler.m4
-- 
1.7.10.4

[PATCH 05/14] libid3tag: remove unrecognised option

[Robert Yang]

There is no --enable-speed in libid3tag's configure, but in libmad, and
it's already there, so remove it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb |    2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
index d81f58b..38d42b0 100644
--- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
+++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
@@ -20,5 +20,3 @@ SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610
 S = "${WORKDIR}/libid3tag-${PV}"
 
 inherit autotools pkgconfig
-
-EXTRA_OECONF = "-enable-speed"
-- 
1.7.10.4

[PATCH 06/14] gstreamer: fix unrecognised options

[Robert Yang]

Fix the following options:

--disable-docs-build: replace with --disable-docbook --disable-gtk-doc
--with-check=no: replace with --disable-check

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb
index 90b1982..4282f07 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb
@@ -21,7 +21,11 @@ SRC_URI[sha256sum] = "e556a529e0a8cf1cd0afd0cab2af5488c9524e7c3f409de29b5d82bb41
 inherit autotools pkgconfig gettext
 
 GSTREAMER_DEBUG ?= "--disable-debug"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind ${GSTREAMER_DEBUG}"
+EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \
+            --disable-dependency-tracking --disable-check \
+            --disable-examples --disable-tests \
+            --disable-valgrind ${GSTREAMER_DEBUG} \
+            "
 
 # apply gstreamer hack after Makefile.in.in in source is replaced by our version from
 # ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed
-- 
1.7.10.4

[PATCH 07/14] gstreamer1.0: remove unrecognised options

[Robert Yang]

Fix the following options:

--disable-docs-build: replace with --disable-docbook --disable-gtk-doc
--with-check=no: --disable-check

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index 3cb478a..479fb3a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -10,7 +10,11 @@ DEPENDS = "glib-2.0 libxml2 bison-native flex-native"
 inherit autotools pkgconfig gettext
 
 GSTREAMER_1_DEBUG ?= "--disable-debug"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind ${GSTREAMER_1_DEBUG}"
+EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \
+                --disable-dependency-tracking --disable-check \
+                --disable-examples --disable-tests \
+                --disable-valgrind ${GSTREAMER_1_DEBUG} \
+                "
 
 RRECOMMENDS_${PN}_qemux86    += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
 RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
-- 
1.7.10.4

[PATCH 08/14] gstreamer1.0: remove unrecognised options

[Robert Yang]

Remove the following two unrecognised options:
* --disable-oggtest
* --disable-vorbistest

They are defined in m4/ogg.m4 and m4/vorbistest.m4, but now configure
doesn't use them, configure.ac uses another way to define the
--enable-ogg and --enable-vorbis, and there is no test options, so
remove them.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc |    2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 697b5bd..b56c506 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -30,8 +30,6 @@ PACKAGECONFIG[pango]   = "--enable-pango,--disable-pango,pango"
 # cdparanoia and libvisual do not seem to exist anywhere in OE
 EXTRA_OECONF += " \
     --disable-freetypetest \
-    --disable-oggtest \
-    --disable-vorbistest \
     --disable-cdparanoia \
     --disable-libvisual \
     ${GSTREAMER_1_0_ORC} \
-- 
1.7.10.4

[PATCH 09/14] bluez-hcidump: remove unrecognised options

[Robert Yang]

Remove the following two options since they are not needed any more:
* --with-bluez-libs
* --with-bluez-includes

  commit 78631c5f66f0580695ff3aac4dc8831e3795b735
  Author: Marcel Holtmann <marcel@holtmann.org>
  Date:   Wed Aug 31 00:57:30 2011 -0700

      Change includes to use local copy of Bluetooth library

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb |    2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
index 6bddcba..8af5c6b 100644
--- a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
+++ b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
@@ -17,6 +17,4 @@ SRC_URI[md5sum] = "2eab54bbd2b59a2ed4274ebb9390cf18"
 SRC_URI[sha256sum] = "9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d88881"
 S = "${WORKDIR}/bluez-hcidump-${PV}"
 
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
 inherit autotools
-- 
1.7.10.4

[PATCH 10/14] enchant: fix unrecognised option

[Robert Yang]

Fix the unrecognised option --disable-binreloc, the configure now uses:

AM_CONDITIONAL(WITH_BINRELOC, test "x$br_cv_binreloc" = "xyes")

We can use br_cv_binreloc=no to fix it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/enchant/enchant_1.6.0.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/enchant/enchant_1.6.0.bb b/meta/recipes-support/enchant/enchant_1.6.0.bb
index c16a2a8..5c9359b 100644
--- a/meta/recipes-support/enchant/enchant_1.6.0.bb
+++ b/meta/recipes-support/enchant/enchant_1.6.0.bb
@@ -17,7 +17,9 @@ SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz
 SRC_URI[md5sum] = "de11011aff801dc61042828041fb59c7"
 SRC_URI[sha256sum] = "2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f"
 
-EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-aspell --disable-binreloc"
+EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \
+		--enable-aspell br_cv_binreloc=no \
+		"
 
 FILES_${PN} = "${bindir} ${libdir}/*${SOLIBS} ${datadir}/${BPN} ${libdir}/${BPN}/*.so"
 FILES_${PN}-dev += "${libdir}/${BPN}/*{SOLIBSDEV} ${libdir}/${BPN}/*.la"
-- 
1.7.10.4

[PATCH 11/14] cups: remove unrecognised option

[Robert Yang]

Remove the following 2 options:
* --disable-tiff
* --with-pdftops

The tiff and pdftops filters have been moved into another package
cups-filters, so these options are not valid any more.

Please visit here for more info:
http://www.cups.org/str.php?L3930

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/cups/cups.inc |    2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index cb5b1a7..7a18500 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -25,7 +25,6 @@ EXTRA_OECONF = " \
                --enable-dbus \
                --enable-browsing \
                --disable-openssl \
-               --disable-tiff \
                --disable-gssapi \
                --enable-debug \
                --disable-relro \
@@ -34,7 +33,6 @@ EXTRA_OECONF = " \
                --without-perl \
                --without-python \
                --without-java \
-               --with-pdftops=none \
                "
 
 
-- 
1.7.10.4

[PATCH 12/14] wget: remove unrecognised option

[Robert Yang]

Remove the --with-libc, I can't find anything about this option from
wget's log history.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/wget/wget.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 7af55c4..9ef5641 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -8,7 +8,7 @@ INC_PR = "r16"
 
 inherit autotools gettext update-alternatives
 
-EXTRA_OECONF = "--with-libc --enable-ipv6 --with-libssl-prefix=${STAGING_DIR_HOST} \
+EXTRA_OECONF = "--enable-ipv6 --with-libssl-prefix=${STAGING_DIR_HOST} \
                 --with-ssl=openssl --disable-rpath --disable-iri \
                 ac_cv_header_uuid_uuid_h=no"
 
-- 
1.7.10.4

[PATCH 13/14] ghostscript: remove unrecognised option

[Robert Yang]

Remove --without-jasper since the jasper had been removed:

  commit 6070a6f33bebf7538e48219010bc1e4de8341ea8
  Author: Ray Johnston <ray.johnston@artifex.com>
  Date:   Fri Aug 3 00:32:32 2012 -0700

      Rip out jasper -- openjpeg is our JPX implementation.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/ghostscript/ghostscript_9.07.bb |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.07.bb b/meta/recipes-extended/ghostscript/ghostscript_9.07.bb
index bd4dd75..3ce9f12 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.07.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.07.bb
@@ -35,13 +35,15 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
 SRC_URI[md5sum] = "57ebf17c5abcf0fc95a386bfff08c1a4"
 SRC_URI[sha256sum] = "44800d004c53f13192d1b5db413119198ddfc8a11c4d2a030aac2f2fda822ebf"
 
-EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \
-                --with-fontpath=${datadir}/fonts --with-install-cups --without-libidn"
+EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
+                --with-fontpath=${datadir}/fonts --with-install-cups \
+                --without-libidn \
+                "
 
 # Explicity disable libtiff, fontconfig,
 # freetype, cups for ghostscript-native
 EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \
-                             --without-jbig2dec --without-jasper \
+                             --without-jbig2dec \
                              --with-fontpath=${datadir}/fonts \
                              --without-libidn --disable-fontconfig \
                              --disable-freetype --disable-cups"
-- 
1.7.10.4

[PATCH 14/14] mesa-demos: fix unrecognised options

[Robert Yang]

Fix two unrecognised options:
* --disable-libosmesa -> --disable-osmesa
* --disable-libx11 -> --disable-x11

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
index 3ac81ef..4bb92f4 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
@@ -34,7 +34,7 @@ PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl"
 PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1"
 PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
 PACKAGECONFIG[glut] = "--with-glut,--without-glut,"
-PACKAGECONFIG[osmesa] = "--enable-libosmesa,--disable-libosmesa,"
+PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"
 PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"
 PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"
-PACKAGECONFIG[x11] = "--enable-libx11,--disable-libx11,virtual/libx11"
+PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11"
-- 
1.7.10.4