diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
| commit | 3937c88166a493900a694ea8fe53b860f4099d83 (patch) | |
| tree | 57597245b6efd4cf27c1f4c9ff21c0515e530c15 /recipes/automake | |
| parent | df2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff) | |
| parent | 3510d2ed15a4b477aa7af802a839e11a87b981ed (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/automake')
| -rw-r--r-- | recipes/automake/automake-native.inc | 11 | ||||
| -rw-r--r-- | recipes/automake/automake-native_1.10.2.bb | 3 | ||||
| -rw-r--r-- | recipes/automake/automake-native_1.11.1.bb | 5 | ||||
| -rw-r--r-- | recipes/automake/automake-native_1.9.6.bb | 3 | ||||
| -rw-r--r-- | recipes/automake/automake.inc | 8 | ||||
| -rw-r--r-- | recipes/automake/automake_1.10.3.bb | 6 |
6 files changed, 12 insertions, 24 deletions
diff --git a/recipes/automake/automake-native.inc b/recipes/automake/automake-native.inc deleted file mode 100644 index 4e2ac41d81..0000000000 --- a/recipes/automake/automake-native.inc +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "devel" -require automake_${PV}.bb -DEPENDS += "autoconf-native" -RDEPENDS_automake-native += "autoconf-native perl-native-runtime" - -inherit native - -do_stage () { - oe_runmake install - install -d ${datadir}/aclocal -} diff --git a/recipes/automake/automake-native_1.10.2.bb b/recipes/automake/automake-native_1.10.2.bb deleted file mode 100644 index 92c861f49c..0000000000 --- a/recipes/automake/automake-native_1.10.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -PV := "${PV}" - -require automake-native.inc diff --git a/recipes/automake/automake-native_1.11.1.bb b/recipes/automake/automake-native_1.11.1.bb deleted file mode 100644 index a7857c562d..0000000000 --- a/recipes/automake/automake-native_1.11.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -PV := "${PV}" - -require automake-native.inc - -DEFAULT_PREFERENCE = "-1" diff --git a/recipes/automake/automake-native_1.9.6.bb b/recipes/automake/automake-native_1.9.6.bb deleted file mode 100644 index 92c861f49c..0000000000 --- a/recipes/automake/automake-native_1.9.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -PV := "${PV}" - -require automake-native.inc diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc index 74957cc9e9..e378c048dc 100644 --- a/recipes/automake/automake.inc +++ b/recipes/automake/automake.inc @@ -2,6 +2,8 @@ DESCRIPTION = "A tool for automatically generating Makefiles." LICENSE = "GPL" HOMEPAGE = "http://www.gnu.org/software/automake/" SECTION = "devel" +DEPENDS_virtclass-native = "autoconf-native" +RDEPENDS_automake-native = "autoconf-native perl-native-runtime" RDEPENDS_automake += "\ autoconf \ perl \ @@ -26,8 +28,8 @@ RDEPENDS_automake += "\ perl-module-strict \ perl-module-text-parsewords \ perl-module-vars " -SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2" -INC_PR = "r2" +SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2;name=automake" +INC_PR = "r3" AUTOMAKE_API = "${@".".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" inherit autotools @@ -47,3 +49,5 @@ do_install_append () { ln -sf automake-${AUTOMAKE_API} ${D}${bindir}/automake install -d ${D}${datadir}/aclocal } + +BBCLASSEXTEND = "native" diff --git a/recipes/automake/automake_1.10.3.bb b/recipes/automake/automake_1.10.3.bb new file mode 100644 index 0000000000..663333a51f --- /dev/null +++ b/recipes/automake/automake_1.10.3.bb @@ -0,0 +1,6 @@ +require automake.inc +PR = "${INC_PR}.0" + +SRC_URI[automake.md5sum] = "b8e67fb458da396bc35555af7ef2b49f" +SRC_URI[automake.sha256sum] = "e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc" + |