]> git.openpandora.org Git - openembedded.git/commitdiff
Merge oe-devel@oe-devel.bkbits.net:openembedded
authorChris Larson <clarson@kergoth.com>
Wed, 9 Mar 2005 22:37:15 +0000 (22:37 +0000)
committerChris Larson <clarson@kergoth.com>
Wed, 9 Mar 2005 22:37:15 +0000 (22:37 +0000)
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/autoconf/autoconf_2.59.bb
packages/automake/automake_1.7.7.bb
packages/automake/automake_1.8.2.bb
packages/automake/automake_1.8.4.bb
packages/automake/automake_1.9.2.bb
packages/automake/automake_1.9.3.bb

index 9ae0b97e91ffea08034dab69226c827789933812..8636a77787219e5e30735f5aeb11cf1ff7bcfe3d 100644 (file)
@@ -6,7 +6,7 @@ SECTION = "devel"
 DEPENDS += "m4-native"
 RDEPENDS_${PN} = "m4 gnu-config"
 RRECOMMENDS_${PN} = "automake"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
           file://program_prefix.patch;patch=1 \
@@ -17,5 +17,5 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
           file://autoconf259-update-configscripts.patch;patch=1 \
           file://autoheader-nonfatal-warnings.patch;patch=1 \
           file://sizeof_types.patch;patch=1 \
-          file://path_prog_fixes.patch;patch=1"
+          ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
 inherit autotools
index f5362e0c722314935b3c7ba6d2ca86eca50704e3..d8405c00d2220b403587768bac26eab10f346a1b 100644 (file)
@@ -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*"
index cc9163998d4eda08e8388e57e9165e2bc1a4c7fc..cdcd1690e1624067f77958aae28477347026b4f8 100644 (file)
@@ -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}"
 
index f5ca24aace3f3372b0bc6e8c308a014e20c78d76..56cf80a327a42ed9fd3403f74544aa1ee9863e4d 100644 (file)
@@ -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
index a72b9c9d808643e44df79ada469cfd2b2feb8121..0bf4288650c239b0c7bed264563941f6291ffe72 100644 (file)
@@ -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}"
 
index 97f01d91bfa634d1635a6b938ada24e27b9d07b1..71bf0bd58bbfa1c39a5d82679279d2847f790c1c 100644 (file)
@@ -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}"