Correct various builds, including expat and pcre.

BKrev: 3f7b6a03P_KMk2YlUkmMee_qcSllSA

11 files changed, 257 insertions, 0 deletions

diff --git a/cross/cross-binutils-2.14.90.0.6.oe b/cross/cross-binutils-2.14.90.0.6.oe
index e69de29bb2..09c17811a7 100644
--- a/cross/cross-binutils-2.14.90.0.6.oe
+++ b/cross/cross-binutils-2.14.90.0.6.oe
@@ -0,0 +1,17 @@
+PROVIDES = virtual/${OLDARCH}-${OLDOS}-binutils
+
+SRC_URI = http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.gz
+S = ${WORKDIR}/binutils-${PV}
+
+CROSS_DIR := ${CROSS_DIR}
+prefix=${CROSS_DIR}
+exec_prefix=${prefix}
+inherit cross autotools
+
+do_stage () {
+	oe_runmake install
+}
+
+do_install () {
+	true
+}
diff --git a/expat/expat-1.95.6.oe b/expat/expat-1.95.6.oe
index e69de29bb2..07833713ba 100644
--- a/expat/expat-1.95.6.oe
+++ b/expat/expat-1.95.6.oe
@@ -0,0 +1,26 @@
+DESCRIPTION = Jim Clarkes XML parser library.
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
+	  file://${FILESDIR}/buildsystem.patch;patch=1
+S = "${WORKDIR}/${P}"
+
+inherit autotools libtool
+export LTCC=${CC}
+
+do_stage () {
+	install -m 0644 lib/expat.h ${STAGING_DIR}/target/include/
+	install -m 0755 .libs/libexpat.so.0.4.0 ${STAGING_LIBDIR}/
+	ln -sf libexpat.so.0.4.0 ${STAGING_LIBDIR}/libexpat.so.1
+	ln -sf libexpat.so.0.4.0 ${STAGING_LIBDIR}/libexpat.so.0
+	ln -sf libexpat.so.0.4.0 ${STAGING_LIBDIR}/libexpat.so
+}
+
+do_install () {
+	oe_runmake prefix="${D}/${prefix}" \
+		bindir="${D}/${bindir}" \
+		libdir="${D}/${libdir}" \
+		includedir="${D}/${includedir}" \
+		install
+}
diff --git a/expat/expat-1.95.6/buildsystem.patch b/expat/expat-1.95.6/buildsystem.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/expat/expat-1.95.6/buildsystem.patch
diff --git a/libtool/libtool-1.4.3.oe b/libtool/libtool-1.4.3.oe
index e69de29bb2..c3072dc29b 100644
--- a/libtool/libtool-1.4.3.oe
+++ b/libtool/libtool-1.4.3.oe
@@ -0,0 +1,38 @@
+PR = r0
+
+DESCRIPTION = Generic library support script\
+ This is GNU libtool, a generic library support script.  Libtool hides\
+ the complexity of generating special library types (such as shared\
+ libraries) behind a consistent interface.  To use libtool, add the\
+ new generic library building commands to your Makefile, Makefile.in,\
+ or Makefile.am.  See the documentation for details.  Libtool supports\
+ building static libraries on all platforms.\
+ Libtool supports generation of C, C++ and Java libraries.
+
+DEPENDS=
+
+SRC_URI = ${DEBIAN_MIRROR}/main/libt/${PN}/${PN}_${PV}.orig.tar.gz \
+	  file://${FILESDIR}/debian.patch;patch=1 \
+	  file://${FILESDIR}/libdir.patch;patch=1 \
+	  file://${FILESDIR}/sedvar.patch;patch=1 \
+	  file://${FILESDIR}/libtoolize-staging.patch;patch=1
+S = "${WORKDIR}/${P}"
+
+inherit autotools
+
+EXTRA_OECONF = --disable-ltdl-install
+do_configure_prepend () {
+	./bootstrap
+}
+
+do_stage () {
+	install -d ${STAGING_DIR}/share/libtool \
+		   ${STAGING_DIR}/share/aclocal
+	install -m 0755 libtool ${STAGING_BINDIR}/libtool
+	install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
+	install -c config.guess ${STAGING_DIR}/share/libtool/
+	install -c config.sub ${STAGING_DIR}/share/libtool/
+	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/
+}
diff --git a/libtool/libtool-1.5.oe b/libtool/libtool-1.5.oe
index e69de29bb2..47e286a12d 100644
--- a/libtool/libtool-1.5.oe
+++ b/libtool/libtool-1.5.oe
@@ -0,0 +1,35 @@
+DESCRIPTION = Generic library support script\
+ This is GNU libtool, a generic library support script.  Libtool hides\
+ the complexity of generating special library types (such as shared\
+ libraries) behind a consistent interface.  To use libtool, add the\
+ new generic library building commands to your Makefile, Makefile.in,\
+ or Makefile.am.  See the documentation for details.  Libtool supports\
+ building static libraries on all platforms.\
+ Libtool supports generation of C, C++ and Java libraries.
+
+SRC_URI = http://ftp.club.cc.cmu.edu/pub/gnu/libtool/libtool-1.5.tar.gz \
+	  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}/libdir-rpath.patch;patch=1
+S = "${WORKDIR}/${P}"
+
+inherit autotools
+
+EXTRA_OECONF = --disable-ltdl-install
+do_configure_prepend () {
+	./bootstrap
+	rm -f ${S}/ltmain.sh
+}
+
+do_stage () {
+	install -d ${STAGING_DIR}/share/{libtool,aclocal}
+	install -m 0755 libtool ${STAGING_BINDIR}/libtool
+	install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
+	install -c config.guess ${STAGING_DIR}/share/libtool/
+	install -c config.sub ${STAGING_DIR}/share/libtool/
+	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/
+}
diff --git a/libtool/libtool-1.5/tag.patch b/libtool/libtool-1.5/tag.patch
index e69de29bb2..dc69088b59 100644
--- a/libtool/libtool-1.5/tag.patch
+++ b/libtool/libtool-1.5/tag.patch
@@ -0,0 +1,38 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libtool-1.5/ltmain.in~tag
++++ libtool-1.5/ltmain.in
+@@ -549,8 +549,9 @@
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+ 	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
++          tagname=CC
++#	  $echo "$modename: specify a tag with \`--tag'" 1>&2
++#	  exit 1
+ #        else
+ #          $echo "$modename: using $tagname tagged configuration"
+ 	fi
+@@ -1651,13 +1652,13 @@
+ 	# If $tagname still isn't set, then no tagged configuration
+ 	# was found and let the user know that the "--tag" command
+ 	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
++#	if test -z "$tagname"; then
++#	  $echo "$modename: unable to infer tagged configuration"
++#	  $echo "$modename: specify a tag with \`--tag'" 1>&2
++#	  exit 1
+ #       else
+ #         $echo "$modename: using $tagname tagged configuration"
+-	fi
++#	fi
+ 	;;
+       esac
+     fi
diff --git a/openssl/openssl-0.9.7b.oe b/openssl/openssl-0.9.7b.oe
index e69de29bb2..a5d6410985 100644
--- a/openssl/openssl-0.9.7b.oe
+++ b/openssl/openssl-0.9.7b.oe
@@ -0,0 +1,30 @@
+SRC_URI = http://www.openssl.org/source/${P}.tar.gz \
+	  file://${FILESDIR}/debian.patch;patch=1
+S = ${WORKDIR}/${PN}-${PV}
+
+DEPENDS = virtual/libc
+SECTION = libs
+DESCRIPTION = Secure Socket Layer (SSL) binary and related cryptographic tools.
+
+AR_append = " r"
+export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}"
+export DIRS = "crypto ssl"
+export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
+do_compile () {
+	perl util/perlpath.pl /usr/bin
+	perl ./Configure shared --prefix=/usr --openssldir=/usr/lib/ssl ${TARGET_OS}-elf-${TARGET_ARCH}
+	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
+	oe_runmake -f Makefile.ssl
+}
+
+do_stage () {
+	cp --dereference -R include/openssl ${STAGING_DIR}/target/include/
+	install -m 0755 libcrypto.so.0.9.7 ${STAGING_LIBDIR}/
+	ln -sf libcrypto.so.0.9.7 ${STAGING_LIBDIR}/libcrypto.so
+	install -m 0755 libssl.so.0.9.7 ${STAGING_LIBDIR}/
+	ln -sf libssl.so.0.9.7 ${STAGING_LIBDIR}/libssl.so
+}
+
+do_install () {
+	oe_runmake -f Makefile.ssl INSTALL_PREFIX="${D}" install
+}
diff --git a/pcre/pcre-4.4.oe b/pcre/pcre-4.4.oe
index e69de29bb2..8a6e4ce556 100644
--- a/pcre/pcre-4.4.oe
+++ b/pcre/pcre-4.4.oe
@@ -0,0 +1,38 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+DESCRIPTION = Perl-compatible regular expression library. PCRE has its own native \
+API, but a set of "wrapper" functions that are based on the POSIX API \
+are also supplied in the library libpcreposix. Note that this just \
+provides a POSIX calling interface to PCRE; the regular expressions \
+themselves still follow Perl syntax and semantics. The header file for \
+the POSIX-style functions is called pcreposix.h.
+
+
+SRC_URI = ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PN}/${P}.tar.bz2 \
+	  file://${FILESDIR}/rpath.patch;patch=1 \
+	  file://${FILESDIR}/lai.patch;patch=1
+S = "${WORKDIR}/${P}"
+
+inherit autotools libtool
+
+CFLAGS_append = " -D_REENTRANT"
+EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000"
+do_compile () {
+	${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c dftables.c
+	${BUILD_CC} dftables.o -o dftables
+	oe_runmake
+}
+
+do_stage () {
+	install -m 0755 .libs/libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/
+	ln -sf libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/libpcreposix.so.0
+	install -m 0755 .libs/libpcre.so.0.0.1 ${STAGING_LIBDIR}/
+	ln -sf libpcre.so.0.0.1 ${STAGING_LIBDIR}/libpcre.so.0
+	
+	ln -sf libpcre.so.0.0.1 ${STAGING_LIBDIR}/libpcre.so
+	ln -sf libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/libpcreposix.so
+	install -m 0644 .libs/libpcre.a ${STAGING_LIBDIR}/
+	install -m 0644 .libs/libpcreposix.a ${STAGING_LIBDIR}/
+	install -m 0644 pcre.h ${STAGING_DIR}/target/include/
+	install -m 0644 pcreposix.h ${STAGING_DIR}/target/include/
+}
diff --git a/pcre/pcre-4.4/lai.patch b/pcre/pcre-4.4/lai.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/pcre/pcre-4.4/lai.patch
diff --git a/pcre/pcre-4.4/rpath.patch b/pcre/pcre-4.4/rpath.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/pcre/pcre-4.4/rpath.patch
diff --git a/zlib/zlib-1.1.4.oe b/zlib/zlib-1.1.4.oe
index e69de29bb2..82a3979306 100644
--- a/zlib/zlib-1.1.4.oe
+++ b/zlib/zlib-1.1.4.oe
@@ -0,0 +1,35 @@
+DESCRIPTION="Zlib Compression Library"
+SECTION="libs"
+PRIORITY="required"
+MAINTAINER="Chris Larson <kergoth@handhelds.org>"
+RDEPENDS="libc6"
+
+SRC_URI="http://www.libpng.org/pub/png/src/zlib-${PV}.tar.gz"
+DEPENDS=virtual/libc
+S="${WORKDIR}/${P}"
+
+export LDSHARED="${CC} -shared -Wl,-soname,libz.so.1"
+export LDFLAGS:="${LDFLAGS} -L. -lz"
+export CFLAGS:="-fPIC ${CFLAGS}"
+export AR_append=" rc"
+EXTRA_OEMAKE=
+
+do_compile() {
+	./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
+	oe_runmake -e MAKEFLAGS="" libz.so.1.1.4 libz.a
+}
+
+do_stage() {
+	install -m 0644 zlib.h ${STAGING_DIR}/target/include/zlib.h
+	install -m 0644 zconf.h ${STAGING_DIR}/target/include/zconf.h
+	install -m 0755 libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so.1.1.4
+	install -m 0755 libz.a ${STAGING_LIBDIR}/libz.a
+	ln -sf ./libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so.1
+	ln -sf ./libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so
+}
+
+do_install() {
+	install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir}
+	oe_runmake 'prefix=${D}/${prefix}' 'includedir=${D}/${includedir}' \
+		   'libdir=${D}/${libdir}' install
+}