From 20f35974a4459590dd1b7a9cc90a70be4014d460 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 4 Nov 2009 16:02:36 +0000
Subject: bzip-full-native: Convert to use BBCLASSEXTEND

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../bzip2/bzip2-full-native-1.0.5/Makefile.am      | 41 ----------------------
 .../bzip2/bzip2-full-native-1.0.5/configure.ac     | 14 --------
 meta/packages/bzip2/bzip2-full-native_1.0.5.bb     | 25 -------------
 meta/packages/bzip2/bzip2_1.0.5.bb                 |  3 ++
 4 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 meta/packages/bzip2/bzip2-full-native-1.0.5/Makefile.am
 delete mode 100644 meta/packages/bzip2/bzip2-full-native-1.0.5/configure.ac
 delete mode 100644 meta/packages/bzip2/bzip2-full-native_1.0.5.bb

(limited to 'meta')

diff --git a/meta/packages/bzip2/bzip2-full-native-1.0.5/Makefile.am b/meta/packages/bzip2/bzip2-full-native-1.0.5/Makefile.am
deleted file mode 100644
index b234e80f3..000000000
--- a/meta/packages/bzip2/bzip2-full-native-1.0.5/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-
-lib_LTLIBRARIES = libbz2.la
-
-libbz2_la_SOURCES = blocksort.c  \
-                    huffman.c    \
-                    crctable.c   \
-                    randtable.c  \
-                    compress.c   \
-                    decompress.c \
-                    bzlib.c
-
-bin_PROGRAMS = bzip2 bzip2recover
-
-bzip2_SOURCES = bzip2.c
-bzip2_LDADD = libbz2.la
-bzip2_DEPENDENCIES = libbz2.la
-
-include_HEADERS = bzlib.h
-
-bzip2recover_SOURCES = bzip2recover.c
-bzip2recover_LDADD = libbz2.la
-bzip2recover_DEPENDENCIES = libbz2.la
-
-bin_SCRIPTS = bzgrep bzgrep bzmore bzdiff
-
-man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1
-EXTRA_DIST = $(man_MANS)
-
-install-exec-hook:
-	ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bunzip2$(EXEEXT)
-	ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bzcat$(EXEEXT)
-	ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzegrep$(EXEEXT)
-	ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzfgrep$(EXEEXT)
-	ln -s $(bindir)/bzmore$(EXEEXT) $(DESTDIR)$(bindir)/bzless$(EXEEXT)
-	ln -s $(bindir)/bzdiff$(EXEEXT) $(DESTDIR)$(bindir)/bzcmp$(EXEEXT)
-
-install-data-hook:
-	echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1
-	echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzfgrep.1
-	echo ".so man1/bzmore.1" > $(DESTDIR)$(mandir)/man1/bzless.1
-	echo ".so man1/bzdiff.1" > $(DESTDIR)$(mandir)/man1/bzcmp.1
diff --git a/meta/packages/bzip2/bzip2-full-native-1.0.5/configure.ac b/meta/packages/bzip2/bzip2-full-native-1.0.5/configure.ac
deleted file mode 100644
index 14b1d1809..000000000
--- a/meta/packages/bzip2/bzip2-full-native-1.0.5/configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
-AC_PREREQ([2.57])
-
-AC_INIT(bzip2, 2.0.5, , libXrender)
-AM_INIT_AUTOMAKE()
-AM_MAINTAINER_MODE
-
-#AM_CONFIG_HEADER(config.h)
-
-# Check for progs
-AC_PROG_CC
-AC_PROG_LIBTOOL
-
-AC_OUTPUT([Makefile])
-
diff --git a/meta/packages/bzip2/bzip2-full-native_1.0.5.bb b/meta/packages/bzip2/bzip2-full-native_1.0.5.bb
deleted file mode 100644
index 13bebbb3d..000000000
--- a/meta/packages/bzip2/bzip2-full-native_1.0.5.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Very high-quality data compression program."
-SECTION = "console/utils"
-PR = "r0"
-
-LICENSE = "bzip2"
-SRC_URI = "http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz \
-           file://configure.ac \
-	   file://Makefile.am"
-
-S = "${WORKDIR}/bzip2-${PV}"
-
-CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
-
-inherit autotools native
-
-do_configure_prepend () {
-	cp ${WORKDIR}/configure.ac ${S}/
-	cp ${WORKDIR}/Makefile.am ${S}/
-	cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/
-}
-
-do_stage () {
-	install -m 0644 bzlib.h ${STAGING_INCDIR}/
-	oe_libinstall -a -so libbz2 ${STAGING_LIBDIR}
-}
diff --git a/meta/packages/bzip2/bzip2_1.0.5.bb b/meta/packages/bzip2/bzip2_1.0.5.bb
index 04e55e308..47769e3cc 100644
--- a/meta/packages/bzip2/bzip2_1.0.5.bb
+++ b/meta/packages/bzip2/bzip2_1.0.5.bb
@@ -37,3 +37,6 @@ pkg_prerm_${PN} () {
 	update-alternatives --remove bunzip2 bunzip2.${PN}
 	update-alternatives --remove bzcat bzcat.${PN}
 }
+
+PROVIDES_append_virtclass-native = " bzip2-full-native"
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3