summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-04 16:02:36 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:23 +0000
commit20f35974a4459590dd1b7a9cc90a70be4014d460 (patch)
treec2948f398d8f88016fce736fcfaa30f4642dbeb3
parentcd7f623b6fb07ad56b8a93355448134f1d4c8bed (diff)
downloadpoky-20f35974a4459590dd1b7a9cc90a70be4014d460.tar.gz
bzip-full-native: Convert to use BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/bzip2/bzip2-full-native-1.0.5/Makefile.am41
-rw-r--r--meta/packages/bzip2/bzip2-full-native-1.0.5/configure.ac14
-rw-r--r--meta/packages/bzip2/bzip2-full-native_1.0.5.bb25
-rw-r--r--meta/packages/bzip2/bzip2_1.0.5.bb3
4 files changed, 3 insertions, 80 deletions
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 b234e80f37..0000000000
--- a/meta/packages/bzip2/bzip2-full-native-1.0.5/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
1
2lib_LTLIBRARIES = libbz2.la
3
4libbz2_la_SOURCES = blocksort.c \
5 huffman.c \
6 crctable.c \
7 randtable.c \
8 compress.c \
9 decompress.c \
10 bzlib.c
11
12bin_PROGRAMS = bzip2 bzip2recover
13
14bzip2_SOURCES = bzip2.c
15bzip2_LDADD = libbz2.la
16bzip2_DEPENDENCIES = libbz2.la
17
18include_HEADERS = bzlib.h
19
20bzip2recover_SOURCES = bzip2recover.c
21bzip2recover_LDADD = libbz2.la
22bzip2recover_DEPENDENCIES = libbz2.la
23
24bin_SCRIPTS = bzgrep bzgrep bzmore bzdiff
25
26man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1
27EXTRA_DIST = $(man_MANS)
28
29install-exec-hook:
30 ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bunzip2$(EXEEXT)
31 ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bzcat$(EXEEXT)
32 ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzegrep$(EXEEXT)
33 ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzfgrep$(EXEEXT)
34 ln -s $(bindir)/bzmore$(EXEEXT) $(DESTDIR)$(bindir)/bzless$(EXEEXT)
35 ln -s $(bindir)/bzdiff$(EXEEXT) $(DESTDIR)$(bindir)/bzcmp$(EXEEXT)
36
37install-data-hook:
38 echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1
39 echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzfgrep.1
40 echo ".so man1/bzmore.1" > $(DESTDIR)$(mandir)/man1/bzless.1
41 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 14b1d1809d..0000000000
--- a/meta/packages/bzip2/bzip2-full-native-1.0.5/configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
1AC_PREREQ([2.57])
2
3AC_INIT(bzip2, 2.0.5, , libXrender)
4AM_INIT_AUTOMAKE()
5AM_MAINTAINER_MODE
6
7#AM_CONFIG_HEADER(config.h)
8
9# Check for progs
10AC_PROG_CC
11AC_PROG_LIBTOOL
12
13AC_OUTPUT([Makefile])
14
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 13bebbb3d5..0000000000
--- a/meta/packages/bzip2/bzip2-full-native_1.0.5.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1DESCRIPTION = "Very high-quality data compression program."
2SECTION = "console/utils"
3PR = "r0"
4
5LICENSE = "bzip2"
6SRC_URI = "http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz \
7 file://configure.ac \
8 file://Makefile.am"
9
10S = "${WORKDIR}/bzip2-${PV}"
11
12CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
13
14inherit autotools native
15
16do_configure_prepend () {
17 cp ${WORKDIR}/configure.ac ${S}/
18 cp ${WORKDIR}/Makefile.am ${S}/
19 cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/
20}
21
22do_stage () {
23 install -m 0644 bzlib.h ${STAGING_INCDIR}/
24 oe_libinstall -a -so libbz2 ${STAGING_LIBDIR}
25}
diff --git a/meta/packages/bzip2/bzip2_1.0.5.bb b/meta/packages/bzip2/bzip2_1.0.5.bb
index 04e55e3083..47769e3ccd 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} () {
37 update-alternatives --remove bunzip2 bunzip2.${PN} 37 update-alternatives --remove bunzip2 bunzip2.${PN}
38 update-alternatives --remove bzcat bzcat.${PN} 38 update-alternatives --remove bzcat bzcat.${PN}
39} 39}
40
41PROVIDES_append_virtclass-native = " bzip2-full-native"
42BBCLASSEXTEND = "native"