summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-04 17:13:11 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:24 +0000
commit170604d54c297ab6c02deb957176d487dad06afe (patch)
treee54859bb6ce2d9bd40526862fbec9c49f2ed7359
parent315d4ab7c8c8cf59cca7c6fd11ccd13e846e1041 (diff)
downloadpoky-170604d54c297ab6c02deb957176d487dad06afe.tar.gz
gdbm: Convert to BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/gdbm/gdbm-native-1.8.3/makefile.patch59
-rw-r--r--meta/packages/gdbm/gdbm-native_1.8.3.bb17
-rw-r--r--meta/packages/gdbm/gdbm_1.8.3.bb2
3 files changed, 2 insertions, 76 deletions
diff --git a/meta/packages/gdbm/gdbm-native-1.8.3/makefile.patch b/meta/packages/gdbm/gdbm-native-1.8.3/makefile.patch
deleted file mode 100644
index 5350c53729..0000000000
--- a/meta/packages/gdbm/gdbm-native-1.8.3/makefile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- gdbm-1.8.3/Makefile.in~makefile
7+++ gdbm-1.8.3/Makefile.in
8@@ -22,6 +22,7 @@
9 TEXI2DVI = texi2dvi
10
11 DEFS =
12+DESTDIR =
13
14 # Where the system [n]dbm routines are...
15 LIBS = @LIBS@ -lc
16@@ -127,26 +128,26 @@
17 progs: $(PROGS)
18
19 install: libgdbm.la gdbm.h gdbm.info
20- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
21- $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
22- $(INSTALL_ROOT)$(infodir)
23- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
24- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
25- $(INSTALL_ROOT)$(includedir)/gdbm.h
26- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
27- $(INSTALL_ROOT)$(man3dir)/gdbm.3
28- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
29- $(INSTALL_ROOT)$(infodir)/gdbm.info
30+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \
31+ $(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) \
32+ $(DESTDIR)$(infodir)
33+ $(LIBTOOL) $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la
34+ $(INSTALL_DATA) gdbm.h \
35+ $(DESTDIR)$(includedir)/gdbm.h
36+ $(INSTALL_DATA) $(srcdir)/gdbm.3 \
37+ $(DESTDIR)$(man3dir)/gdbm.3
38+ $(INSTALL_DATA) $(srcdir)/gdbm.info \
39+ $(DESTDIR)$(infodir)/gdbm.info
40
41 install-compat:
42- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
43- $(INSTALL_ROOT)$(includedir)
44+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \
45+ $(DESTDIR)$(includedir)
46 $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
47- $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
48- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
49- $(INSTALL_ROOT)$(includedir)/dbm.h
50- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
51- $(INSTALL_ROOT)$(includedir)/ndbm.h
52+ $(DESTDIR)$(libdir)/libgdbm_compat.la
53+ $(INSTALL_DATA) $(srcdir)/dbm.h \
54+ $(DESTDIR)$(includedir)/dbm.h
55+ $(INSTALL_DATA) $(srcdir)/ndbm.h \
56+ $(DESTDIR)$(includedir)/ndbm.h
57
58 #libgdbm.a: $(OBJS) gdbm.h
59 # rm -f libgdbm.a
diff --git a/meta/packages/gdbm/gdbm-native_1.8.3.bb b/meta/packages/gdbm/gdbm-native_1.8.3.bb
deleted file mode 100644
index adfc0459c2..0000000000
--- a/meta/packages/gdbm/gdbm-native_1.8.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1DESCRIPTION = "GNU dbm is a set of database routines that use extensible hashing."
2HOMEPAGE = "http://www.gnu.org/software/gdbm/gdbm.html"
3SECTION = "libs"
4PRIORITY = "optional"
5LICENSE = "GPL"
6PR = "r2"
7
8SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
9 file://makefile.patch;patch=1"
10S = "${WORKDIR}/gdbm-${PV}"
11
12inherit autotools native
13
14do_stage () {
15 oe_libinstall -so -a libgdbm ${STAGING_LIBDIR}
16 install -m 0644 ${S}/gdbm.h ${STAGING_INCDIR}/
17}
diff --git a/meta/packages/gdbm/gdbm_1.8.3.bb b/meta/packages/gdbm/gdbm_1.8.3.bb
index f3beb47b41..048e0dd028 100644
--- a/meta/packages/gdbm/gdbm_1.8.3.bb
+++ b/meta/packages/gdbm/gdbm_1.8.3.bb
@@ -16,3 +16,5 @@ do_stage () {
16 oe_libinstall -so -a libgdbm ${STAGING_LIBDIR} 16 oe_libinstall -so -a libgdbm ${STAGING_LIBDIR}
17 install -m 0644 ${S}/gdbm.h ${STAGING_INCDIR}/ 17 install -m 0644 ${S}/gdbm.h ${STAGING_INCDIR}/
18} 18}
19
20BBCLASSEXTEND = "native"