Build fixes for flnx, libxml2, and openssh 3.8p1.

BKrev: 4060b242vOhaV4FacYfSUz-JxsXTpg

diff --git a/flnx/flnx_0.18.oe b/flnx/flnx_0.18.oe
index 5ae62d4..c262e99 100644 (file)
--- a/flnx/flnx_0.18.oe
+++ b/flnx/flnx_0.18.oe
@@ -17,6 +17,7 @@ python do_fetch () {
 }
 
 python do_unpack () {
+       import string
        src_uri = oe.data.getVar("SRC_URI", d)
        src_uri = string.replace(src_uri, "-tar", ".tar")
        oe.data.setVar("SRC_URI", src_uri, d)

diff --git a/libxml/libxml2_2.6.7.oe b/libxml/libxml2_2.6.7.oe
index ec9aacd..03b9b36 100644 (file)
--- a/libxml/libxml2_2.6.7.oe
+++ b/libxml/libxml2_2.6.7.oe
@@ -8,8 +8,9 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-${PV}.tar.b
 
 inherit autotools pkgconfig libtool
 
-libname = "libxml2.so.2.6.7"
+EXTRA_OECONF = "--without-python"
 
+libname = "libxml2.so.2.6.7"
 headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
 
 do_stage () {

diff --git a/openssh/openssh_3.8p1.oe b/openssh/openssh_3.8p1.oe
index b932c28..6b017c3 100644 (file)
--- a/openssh/openssh_3.8p1.oe
+++ b/openssh/openssh_3.8p1.oe
@@ -22,7 +22,8 @@ CFLAGS_prepend = "-I${S} "
 CFLAGS_append = " -D__FILE_OFFSET_BITS=64"
 LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat "
 EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
-              --with-rand-helper=no --without-pam"
+               --with-rand-helper=no --without-pam \
+               --without-zlib-version-check"
 EXTRA_OEMAKE = "'STRIP_OPT='"
 
 do_configure_prepend () {