From c992cce071bf77ae5d86e80facaee70869ca4c24 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 9 Mar 2005 22:37:15 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/03/09 17:37:05-05:00 handhelds.org!kergoth autoconf and automake: don't apply the path fixes in the native builds. BKrev: 422f7a9b8d79v2gXP5Jz_3mKBhtupQ --- packages/automake/automake_1.7.7.bb | 4 ++-- packages/automake/automake_1.8.2.bb | 4 ++-- packages/automake/automake_1.8.4.bb | 4 ++-- packages/automake/automake_1.9.2.bb | 4 ++-- packages/automake/automake_1.9.3.bb | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'packages/automake') diff --git a/packages/automake/automake_1.7.7.bb b/packages/automake/automake_1.7.7.bb index f5362e0c72..d8405c00d2 100644 --- a/packages/automake/automake_1.7.7.bb +++ b/packages/automake/automake_1.7.7.bb @@ -1,9 +1,9 @@ SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ - file://path_prog_fixes.patch;patch=1" + ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" DESCRIPTION = "A tool for automatically generating Makefiles." SECTION = "devel" LICENSE = "GPL" -PR = "r6" +PR = "r7" inherit autotools FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" diff --git a/packages/automake/automake_1.8.2.bb b/packages/automake/automake_1.8.2.bb index cc9163998d..cdcd1690e1 100644 --- a/packages/automake/automake_1.8.2.bb +++ b/packages/automake/automake_1.8.2.bb @@ -1,10 +1,10 @@ SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ file://automake182-update-configscripts.patch;patch=1;pnum=1 \ - file://path_prog_fixes.patch;patch=1" + ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" DESCRIPTION = "A tool for automatically generating Makefiles." SECTION = "devel" LICENSE = "GPL" -PR = "r6" +PR = "r7" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}" diff --git a/packages/automake/automake_1.8.4.bb b/packages/automake/automake_1.8.4.bb index f5ca24aace..56cf80a327 100644 --- a/packages/automake/automake_1.8.4.bb +++ b/packages/automake/automake_1.8.4.bb @@ -2,10 +2,10 @@ DESCRIPTION = "A tool for automatically generating Makefiles." LICENSE = "GPL" HOMEPAGE = "http://www.gnu.org/software/automake/" SECTION = "devel" -PR = "r6" +PR = "r7" SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ - file://path_prog_fixes.patch;patch=1" + ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}" inherit autotools diff --git a/packages/automake/automake_1.9.2.bb b/packages/automake/automake_1.9.2.bb index a72b9c9d80..0bf4288650 100644 --- a/packages/automake/automake_1.9.2.bb +++ b/packages/automake/automake_1.9.2.bb @@ -2,10 +2,10 @@ DESCRIPTION = "A tool for automatically generating Makefiles." LICENSE = "GPL" HOMEPAGE = "http://www.gnu.org/software/automake/" SECTION = "devel" -PR = "r6" +PR = "r7" SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ - file://path_prog_fixes.patch;patch=1" + ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" S = "${WORKDIR}/automake-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}" diff --git a/packages/automake/automake_1.9.3.bb b/packages/automake/automake_1.9.3.bb index 97f01d91bf..71bf0bd58b 100644 --- a/packages/automake/automake_1.9.3.bb +++ b/packages/automake/automake_1.9.3.bb @@ -2,10 +2,10 @@ DESCRIPTION = "A tool for automatically generating Makefiles." LICENSE = "GPL" HOMEPAGE = "http://www.gnu.org/software/automake/" SECTION = "devel" -PR = "r4" +PR = "r5" SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ - file://path_prog_fixes.patch;patch=1" + ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" S = "${WORKDIR}/automake-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}" -- cgit v1.2.3