summaryrefslogtreecommitdiffstats
path: root/meta/packages/automake
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-20 13:10:38 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-20 13:10:38 +0000
commitfa334003652967769b9b47c3f172fe1079c278bf (patch)
tree4143eb230d72d089e9e405b88af25bc42556d136 /meta/packages/automake
parent1e90da6731753b228739a2b7abf336e403a9bd96 (diff)
downloadpoky-fa334003652967769b9b47c3f172fe1079c278bf.tar.gz
automake: finish updating to 1.10, move some content between files to clean up
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4105 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/automake')
-rw-r--r--meta/packages/automake/automake-native.inc4
-rw-r--r--meta/packages/automake/automake.inc39
-rw-r--r--meta/packages/automake/automake_1.10.bb45
3 files changed, 45 insertions, 43 deletions
diff --git a/meta/packages/automake/automake-native.inc b/meta/packages/automake/automake-native.inc
index 7b69252ff0..8b64af309a 100644
--- a/meta/packages/automake/automake-native.inc
+++ b/meta/packages/automake/automake-native.inc
@@ -1,5 +1,5 @@
1SECTION = "devel" 1require automake.inc
2include automake_${PV}.bb 2
3DEPENDS = "autoconf-native" 3DEPENDS = "autoconf-native"
4RDEPENDS_automake-native = "autoconf-native perl-native-runtime" 4RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
5 5
diff --git a/meta/packages/automake/automake.inc b/meta/packages/automake/automake.inc
index fa59c1f5cc..ab2edf26bc 100644
--- a/meta/packages/automake/automake.inc
+++ b/meta/packages/automake/automake.inc
@@ -1,23 +1,16 @@
1RDEPENDS_automake += "\ 1DESCRIPTION = "A tool for automatically generating Makefiles."
2 autoconf \ 2LICENSE = "GPL"
3 perl \ 3HOMEPAGE = "http://www.gnu.org/software/automake/"
4 perl-module-bytes \ 4SECTION = "devel"
5 perl-module-constant \ 5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
6 perl-module-cwd \ 6PR = "r1"
7 perl-module-data-dumper \ 7
8 perl-module-dynaloader \ 8SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
9 perl-module-errno \ 9
10 perl-module-exporter-heavy \ 10S = "${WORKDIR}/automake-${PV}"
11 perl-module-file-basename \ 11
12 perl-module-file-compare \ 12inherit autotools
13 perl-module-file-copy \ 13
14 perl-module-file-glob \ 14export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
15 perl-module-file-spec-unix \ 15
16 perl-module-file-stat \ 16FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
17 perl-module-getopt-long \
18 perl-module-io \
19 perl-module-io-file \
20 perl-module-posix \
21 perl-module-strict \
22 perl-module-text-parsewords \
23 perl-module-vars "
diff --git a/meta/packages/automake/automake_1.10.bb b/meta/packages/automake/automake_1.10.bb
index 1235c10963..4c54d069ca 100644
--- a/meta/packages/automake/automake_1.10.bb
+++ b/meta/packages/automake/automake_1.10.bb
@@ -1,29 +1,38 @@
1DESCRIPTION = "A tool for automatically generating Makefiles." 1require automake.inc
2LICENSE = "GPL"
3HOMEPAGE = "http://www.gnu.org/software/automake/"
4SECTION = "devel"
5
6SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
7 ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
8
9S = "${WORKDIR}/automake-${PV}"
10
11FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
12
13inherit autotools
14 2
15export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}" 3RDEPENDS_automake += "\
16FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" 4 autoconf \
5 perl \
6 perl-module-bytes \
7 perl-module-constant \
8 perl-module-cwd \
9 perl-module-data-dumper \
10 perl-module-dynaloader \
11 perl-module-errno \
12 perl-module-exporter-heavy \
13 perl-module-file-basename \
14 perl-module-file-compare \
15 perl-module-file-copy \
16 perl-module-file-glob \
17 perl-module-file-spec-unix \
18 perl-module-file-stat \
19 perl-module-getopt-long \
20 perl-module-io \
21 perl-module-io-file \
22 perl-module-posix \
23 perl-module-strict \
24 perl-module-text-parsewords \
25 perl-module-vars "
17 26
18require automake.inc 27SRC_URI += "file://path_prog_fixes.patch;patch=1"
19 28
20do_install () { 29do_install () {
21 oe_runmake 'DESTDIR=${D}' install 30 oe_runmake 'DESTDIR=${D}' install
22 install -d ${D}${datadir} 31 install -d ${D}${datadir}
23 if [ ! -e ${D}${datadir}/aclocal ]; then 32 if [ ! -e ${D}${datadir}/aclocal ]; then
24 ln -sf aclocal-1.9 ${D}${datadir}/aclocal 33 ln -sf aclocal-1.10 ${D}${datadir}/aclocal
25 fi 34 fi
26 if [ ! -e ${D}${datadir}/automake ]; then 35 if [ ! -e ${D}${datadir}/automake ]; then
27 ln -sf automake-1.9 ${D}${datadir}/automake 36 ln -sf automake-1.10 ${D}${datadir}/automake
28 fi 37 fi
29} 38}