summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Gilbert <greg@treke.net>2004-11-20 23:09:13 +0000
committerGreg Gilbert <greg@treke.net>2004-11-20 23:09:13 +0000
commit2ce1d6cf0cf627be2e361a02e1106d84c0dfbc17 (patch)
tree25fcd4d13ffbf705ed5c97bb0fa1047f5d1712e4
parentce5460bde60053e084ef08a50f4f3c9af26230fd (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into olddog.home.treke.net:/home/ggilbert/oe/packages 2004/11/20 16:12:11-06:00 kergoth.com!kergoth Merge openembedded@openembedded.bkbits.net:packages-devel into hyperion.kergoth.com:/home/kergoth/code/packages 2004/11/20 17:09:11-06:00 ti.com!kergoth Add automake 1.9.3 (not preferred by default), and add 'perl' to the runtime depends of the automake packages. BKrev: 419fce99zAvIEX8NMtne0Xh9cbs7HQ
-rw-r--r--automake/automake-1.9.3/automake182-update-configscripts.patch0
-rw-r--r--automake/automake_1.7.7.oe3
-rw-r--r--automake/automake_1.8.2.oe3
-rw-r--r--automake/automake_1.8.4.oe3
-rw-r--r--automake/automake_1.9.2.oe27
-rw-r--r--automake/automake_1.9.3.oe0
6 files changed, 33 insertions, 3 deletions
diff --git a/automake/automake-1.9.3/automake182-update-configscripts.patch b/automake/automake-1.9.3/automake182-update-configscripts.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/automake/automake-1.9.3/automake182-update-configscripts.patch
diff --git a/automake/automake_1.7.7.oe b/automake/automake_1.7.7.oe
index 23777b6202..447b1b9a9b 100644
--- a/automake/automake_1.7.7.oe
+++ b/automake/automake_1.7.7.oe
@@ -2,10 +2,11 @@ SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
DESCRIPTION = "A tool for automatically generating Makefiles."
SECTION = "devel"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
inherit autotools
FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+RDEPENDS_${PN} += "perl"
do_install () {
oe_runmake 'DESTDIR=${D}' install
diff --git a/automake/automake_1.8.2.oe b/automake/automake_1.8.2.oe
index a132e5ba33..9ff52f4964 100644
--- a/automake/automake_1.8.2.oe
+++ b/automake/automake_1.8.2.oe
@@ -3,13 +3,14 @@ SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
DESCRIPTION = "A tool for automatically generating Makefiles."
SECTION = "devel"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/automake-${PV}"
inherit autotools
FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+RDEPENDS_${PN} += "perl"
do_install () {
oe_runmake 'DESTDIR=${D}' install
diff --git a/automake/automake_1.8.4.oe b/automake/automake_1.8.4.oe
index 352ea7e86a..1d5589ae79 100644
--- a/automake/automake_1.8.4.oe
+++ b/automake/automake_1.8.4.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
LICENSE = "GPL"
HOMEPAGE = "http://www.gnu.org/software/automake/"
SECTION = "devel"
-PR = "r1"
+PR = "r2"
SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/automake-${PV}"
@@ -10,6 +10,7 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/automake-${PV}"
inherit autotools
FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+RDEPENDS_${PN} += "perl"
do_install () {
oe_runmake 'DESTDIR=${D}' install
diff --git a/automake/automake_1.9.2.oe b/automake/automake_1.9.2.oe
index e69de29bb2..bfa23994c6 100644
--- a/automake/automake_1.9.2.oe
+++ b/automake/automake_1.9.2.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "A tool for automatically generating Makefiles."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
+PR = "r2"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
+S = "${WORKDIR}/automake-${PV}"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/automake-${PV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+RDEPENDS_${PN} += "perl"
+
+do_install () {
+ oe_runmake 'DESTDIR=${D}' install
+ install -d ${D}/${datadir}
+ if [ ! -e ${D}/${datadir}/aclocal ]; then
+ ln -sf aclocal-1.9 ${D}/${datadir}/aclocal
+ fi
+ if [ ! -e ${D}/${datadir}/automake ]; then
+ ln -sf automake-1.9 ${D}/${datadir}/automake
+ fi
+}
diff --git a/automake/automake_1.9.3.oe b/automake/automake_1.9.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/automake/automake_1.9.3.oe