[oe-commits] org.oe.packaged-staging packages: sync remainder with .dev (mainly s/include/require/)
rpurdie commit
openembedded-commits at lists.openembedded.org
Fri Sep 29 03:33:02 UTC 2006
packages: sync remainder with .dev (mainly s/include/require/)
Author: rpurdie at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: fdfda9ee4e0ed49a768b2576670eb6075275028e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fdfda9ee4e0ed49a768b2576670eb6075275028e
Files:
1
packages/bitbake/bitbake_1.0.bb
packages/bitbake/bitbake_1.1.bb
packages/bitbake/bitbake_1.6.0.bb
packages/angstrom/angstrom-version.bb
packages/autoconf/autoconf-2.59/sizeof_types.patch
packages/autoconf/autoconf-native_2.59.bb
packages/autoconf/autoconf_2.59.bb
packages/automake/automake-native_1.8.2.bb
packages/automake/automake-native_1.8.4.bb
packages/automake/automake-native_1.9.2.bb
packages/automake/automake-native_1.9.3.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
packages/bison/bison-native_2.0.bb
packages/bitbake/bitbake.inc
packages/bitbake/bitbake_svn.bb
packages/file/file-native_4.16.bb
packages/flex/flex-native_2.5.31.bb
packages/flex/flex_2.5.31.bb
packages/gettext/gettext-native_0.14.1.bb
packages/glibc/glibc-initial_2.4.bb
packages/glibc/glibc-intermediate_2.4.bb
packages/glibc/glibc_2.4.bb
packages/gmp/gmp-native_4.1.2.bb
packages/gnu-config/gnu-config-native_20050701.bb
packages/m4/m4-native_1.4.2.bb
packages/mpfr/mpfr-native_2.1.1.bb
packages/ncurses/ncurses-native_5.4.bb
packages/ncurses/ncurses_5.4.bb
packages/pkgconfig/pkgconfig-native_0.15.0.bb
Diffs:
#
# mt diff -r1d544eb57d7a4e5e6fbdd93a72afb2b2f6e977df -rfdfda9ee4e0ed49a768b2576670eb6075275028e
#
#
#
# delete "packages/bitbake/bitbake_1.0.bb"
#
# delete "packages/bitbake/bitbake_1.1.bb"
#
# add_file "packages/bitbake/bitbake_1.6.0.bb"
# content [f225858adf3e24ed89529b5a7ca01edd7f02a4bc]
#
# patch "packages/angstrom/angstrom-version.bb"
# from [0e57107426861037456191fce5dd19413a687ddc]
# to [9c9900186b1316cabd3a832a1a0d7a89869b8748]
#
# patch "packages/autoconf/autoconf-2.59/sizeof_types.patch"
# from [b0b976cf64cf96dd24c9d20d7a0a1c2da5703f74]
# to [2d947eda13306b6c4276f1bdda555290c5e9d6de]
#
# patch "packages/autoconf/autoconf-native_2.59.bb"
# from [c99feaa52acbf2a5f051a71c576eef95b9dc2bbd]
# to [123df87ebdc909a5ba3ac4d0adb077d9f1656cc5]
#
# patch "packages/autoconf/autoconf_2.59.bb"
# from [c503323d0771b01270d0d20da423db4a6872d093]
# to [ac15814c8bac590ab34efc89408b0eb53576e043]
#
# patch "packages/automake/automake-native_1.8.2.bb"
# from [252f54c2b6d02a9281d11feebad8d0a45b415b0a]
# to [55ec404a7e4a0ed21021074650803d3ecbdbadea]
#
# patch "packages/automake/automake-native_1.8.4.bb"
# from [252f54c2b6d02a9281d11feebad8d0a45b415b0a]
# to [55ec404a7e4a0ed21021074650803d3ecbdbadea]
#
# patch "packages/automake/automake-native_1.9.2.bb"
# from [a613d200f9af194dd37465032aa9af89f52dc93c]
# to [b98881f99aa673506efb216e29347580cd5185f6]
#
# patch "packages/automake/automake-native_1.9.3.bb"
# from [b4ccb510fed0dcb0b3e8b6f08d620944fc3734cb]
# to [515a0d90c13871057bedf62fc57fab2658deedf4]
#
# patch "packages/automake/automake_1.7.7.bb"
# from [c77d0f88632b88c9f1efcd15b2a5b5a7bd975351]
# to [4e70f758c2e8922f54dfc1e8e41ede2a044ecb99]
#
# patch "packages/automake/automake_1.8.2.bb"
# from [3f4d87879e54e1703caea774cfad8394c7d71006]
# to [1c5a44a120611970d67fdea2251c242f41e00d13]
#
# patch "packages/automake/automake_1.8.4.bb"
# from [d22999d65fa763fd7bbb54f863eea39bb1349181]
# to [dbead0a20da4dd0a1a52eab2aad0e1ac11c422c6]
#
# patch "packages/automake/automake_1.9.2.bb"
# from [8cacf7931bffb7a025dcafdeb51a0708e4ebaea3]
# to [ab1f6496236c98997ade050efd382f7e6426213d]
#
# patch "packages/automake/automake_1.9.3.bb"
# from [1655d741639d65fa23f895f7d55c35e9ab1726ce]
# to [81107ea0266d47b1464c3374ef1d5bc7ddc26f8c]
#
# patch "packages/bison/bison-native_2.0.bb"
# from [00c8dff49e5bc2b414fc2178605eb18827746bb7]
# to [b6d1493bb6da2e6d2f4f9b09dc4ad1ce1a80bed9]
#
# patch "packages/bitbake/bitbake.inc"
# from [f602660d9fabc00e4ead2b5e514d763e4f04f812]
# to [1ec8827a3545b200cb256ae42d5aefe5305549f2]
#
# patch "packages/bitbake/bitbake_svn.bb"
# from [5e34a07b5f525ce75f41fa38c7fdacf1208482ed]
# to [6cdb9bfa6f653b95ff5f6a458df92834ad0a8bdb]
#
# patch "packages/file/file-native_4.16.bb"
# from [f4972b86f91e250ba146fb090ae2571099c11e70]
# to [52c595486a06f4aa70368b84f336a7fdb554ca69]
#
# patch "packages/flex/flex-native_2.5.31.bb"
# from [7f446a012d83345d631f0452fe31a50bc8d90c78]
# to [adf1d2f20b3e013b75d5258e3759d0a41d433b2c]
#
# patch "packages/flex/flex_2.5.31.bb"
# from [ad347b5c44cd993bdca3020c868d24f3903b61e4]
# to [be13de28f4a853d9ceb301e497768769c52fc22a]
#
# patch "packages/gettext/gettext-native_0.14.1.bb"
# from [d20c54959fa6f40cb27c408881a25d653900c358]
# to [5573b70e6cbee4dc9639ecbef5e47e8c411d325c]
#
# patch "packages/glibc/glibc-initial_2.4.bb"
# from [7f8234eb4078704d597a54789b68fb686ada8289]
# to [36a2668bc6d16ccfb1004de3e9566b2e2a7e84e1]
#
# patch "packages/glibc/glibc-intermediate_2.4.bb"
# from [948f3f1b92bfe8505b5bd2c0f47a0316a324be2e]
# to [fc35ed7f3d89210d3006b73ff4e19d6accc64279]
#
# patch "packages/glibc/glibc_2.4.bb"
# from [550fa5cc4faa13f87f59cb24208ea854480b799f]
# to [af26aacc53ebacf3464268c16e6376d5763da586]
#
# patch "packages/gmp/gmp-native_4.1.2.bb"
# from [35bb169a3947764f6807ff596856c03b31372e19]
# to [64191700ac80118fe9326762413379fc4d8acee1]
#
# patch "packages/gnu-config/gnu-config-native_20050701.bb"
# from [61657a50aa346933392d953eba08cf90044dfe0f]
# to [f3e16d577d2d2f46080d7f09b2b8045f1e87dd3a]
#
# patch "packages/m4/m4-native_1.4.2.bb"
# from [c7baf6626bf6174dc9f17777a79d5f48753e45c5]
# to [66da8c4cd4094988998f5d6f15bc00a1f7e1877c]
#
# patch "packages/mpfr/mpfr-native_2.1.1.bb"
# from [e3112ff1b4c74553dbbd1022c6583731ca98de53]
# to [41f0822f894ea44761b8d80834b7ded6ed91ad66]
#
# patch "packages/ncurses/ncurses-native_5.4.bb"
# from [16ff9d11301bdac769dae12761e2552ebf251c2a]
# to [a999c65ecabf966bb56d9b4f66f1bacabcf65a79]
#
# patch "packages/ncurses/ncurses_5.4.bb"
# from [7304b867db264325a8148b7e3dafb308cb2b673c]
# to [b3e5f45623a8c35ae179e1aa93ca97b484fe83a9]
#
# patch "packages/pkgconfig/pkgconfig-native_0.15.0.bb"
# from [338f04aef713cb72b3bccbba371baafb38f30086]
# to [27d99f2be7ecbfc17b41ee740ac0434bd5a147d1]
#
============================================================
--- packages/bitbake/bitbake_1.6.0.bb f225858adf3e24ed89529b5a7ca01edd7f02a4bc
+++ packages/bitbake/bitbake_1.6.0.bb f225858adf3e24ed89529b5a7ca01edd7f02a4bc
@@ -0,0 +1,16 @@
+require bitbake.inc
+
+PR = "r1"
+
+# We don't need a toolchain...
+INHIBIT_DEFAULT_DEPS = "1"
+
+SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz"
+
+S = "${WORKDIR}/bitbake-${PV}"
+
+inherit distutils
+
+require bitbake-package.inc
+
+RDEPENDS += "python-shell python-lang python-textutils python-pickle"
============================================================
--- packages/angstrom/angstrom-version.bb 0e57107426861037456191fce5dd19413a687ddc
+++ packages/angstrom/angstrom-version.bb 9c9900186b1316cabd3a832a1a0d7a89869b8748
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen at handhelds.org>"
+MAINTAINER = "Koen Kooi <koen at linuxtogo.org>"
PV = ${DISTRO_VERSION}
do_compile() {
============================================================
--- packages/autoconf/autoconf-2.59/sizeof_types.patch b0b976cf64cf96dd24c9d20d7a0a1c2da5703f74
+++ packages/autoconf/autoconf-2.59/sizeof_types.patch 2d947eda13306b6c4276f1bdda555290c5e9d6de
@@ -1,17 +1,40 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
---- autoconf-2.59/lib/autoconf/types.m4~sizeof_types.patch 2003-05-22 08:05:14.000000000 -0400
-+++ autoconf-2.59/lib/autoconf/types.m4 2004-05-29 01:31:24.828295015 -0400
-@@ -380,32 +380,38 @@
+Index: autoconf-2.59/lib/autoconf/types.m4
+===================================================================
+--- autoconf-2.59.orig/lib/autoconf/types.m4 2003-05-22 14:05:14.000000000 +0200
++++ autoconf-2.59/lib/autoconf/types.m4 2006-08-06 02:05:02.000000000 +0200
+@@ -380,26 +380,66 @@
# Generic checks. #
# ---------------- #
++# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
++# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
++# ------------------------------------------------------------------------
++# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
++AC_DEFUN([AC_CHECK_TARGET_TOOL],
++[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
++AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
++if test -z "$ac_cv_prog_$1"; then
++ if test "$build" = "$target"; then
++ ac_ct_$1=$$1
++ AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
++ $1=ac_ct_$1
++ else
++ $1="$3"
++ fi
++else
++ $1="$ac_cv_prog_$1"
++fi
++])# AC_CHECK_TARGET_TOOL
++
++
+AC_DEFUN([AC_PROG_SIZE],
+[
-+ AC_CHECK_TOOL(SIZE, size, :)
++ AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
+])
# AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
@@ -35,14 +58,25 @@
- [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
+[
+if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
-+ [static const $1 x[[256]];])],
-+ [
-+ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
-+ ],
-+ [
-+ AS_TR_SH([ac_cv_sizeof_$1])=0
-+ ])
++ if test "$cross_compiling" = yes; then
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
++ [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
++ [
++ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
++ ],
++ [
++ AS_TR_SH([ac_cv_sizeof_$1])=0
++ ])
++ else
++ # The cast to unsigned long works around a bug in the HP C Compiler
++ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++ # This bug is HP SR number 8606223364.
++ _AC_COMPUTE_INT([(long) (sizeof ($1))],
++ [AS_TR_SH([ac_cv_sizeof_$1])],
++ [AC_INCLUDES_DEFAULT([$3])],
++ [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
++ fi
else
AS_TR_SH([ac_cv_sizeof_$1])=0
-fi])dnl
@@ -51,9 +85,3 @@
AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
[The size of a `$1', as computed by sizeof.])
])# AC_CHECK_SIZEOF
-
--
--
- # ---------------- #
- # Generic checks. #
- # ---------------- #
============================================================
--- packages/autoconf/autoconf-native_2.59.bb c99feaa52acbf2a5f051a71c576eef95b9dc2bbd
+++ packages/autoconf/autoconf-native_2.59.bb 123df87ebdc909a5ba3ac4d0adb077d9f1656cc5
@@ -1,8 +1,7 @@ SECTION = "devel"
SECTION = "devel"
-include autoconf_${PV}.bb
+require autoconf_${PV}.bb
DEPENDS = "m4-native gnu-config-native"
RDEPENDS_${PN} = "m4-native gnu-config-native"
-RRECOMMENDS_${PN} = "automake-native"
S = "${WORKDIR}/autoconf-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
============================================================
--- packages/autoconf/autoconf_2.59.bb c503323d0771b01270d0d20da423db4a6872d093
+++ packages/autoconf/autoconf_2.59.bb ac15814c8bac590ab34efc89408b0eb53576e043
@@ -5,8 +5,7 @@ RDEPENDS_${PN} = "m4 gnu-config"
SECTION = "devel"
DEPENDS += "m4-native"
RDEPENDS_${PN} = "m4 gnu-config"
-RRECOMMENDS_${PN} = "automake"
-PR = "r4"
+PR = "r5"
SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
file://program_prefix.patch;patch=1 \
============================================================
--- packages/automake/automake-native_1.8.2.bb 252f54c2b6d02a9281d11feebad8d0a45b415b0a
+++ packages/automake/automake-native_1.8.2.bb 55ec404a7e4a0ed21021074650803d3ecbdbadea
@@ -1,5 +1,5 @@ SECTION = "devel"
SECTION = "devel"
-include automake_${PV}.bb
+require automake_${PV}.bb
S = "${WORKDIR}/automake-${PV}"
DEPENDS = "autoconf-native"
RDEPENDS_${PN} = "autoconf-native perl-native-runtime"
============================================================
--- packages/automake/automake-native_1.8.4.bb 252f54c2b6d02a9281d11feebad8d0a45b415b0a
+++ packages/automake/automake-native_1.8.4.bb 55ec404a7e4a0ed21021074650803d3ecbdbadea
@@ -1,5 +1,5 @@ SECTION = "devel"
SECTION = "devel"
-include automake_${PV}.bb
+require automake_${PV}.bb
S = "${WORKDIR}/automake-${PV}"
DEPENDS = "autoconf-native"
RDEPENDS_${PN} = "autoconf-native perl-native-runtime"
============================================================
--- packages/automake/automake-native_1.9.2.bb a613d200f9af194dd37465032aa9af89f52dc93c
+++ packages/automake/automake-native_1.9.2.bb b98881f99aa673506efb216e29347580cd5185f6
@@ -1,2 +1,2 @@ PV := "${PV}"
PV := "${PV}"
+require automake-native.inc
-include automake-native.inc
============================================================
--- packages/automake/automake-native_1.9.3.bb b4ccb510fed0dcb0b3e8b6f08d620944fc3734cb
+++ packages/automake/automake-native_1.9.3.bb 515a0d90c13871057bedf62fc57fab2658deedf4
@@ -1,3 +1,3 @@ PV := "${PV}"
PV := "${PV}"
+require automake-native.inc
-include automake-native.inc
============================================================
--- packages/automake/automake_1.7.7.bb c77d0f88632b88c9f1efcd15b2a5b5a7bd975351
+++ packages/automake/automake_1.7.7.bb 4e70f758c2e8922f54dfc1e8e41ede2a044ecb99
@@ -8,7 +8,7 @@ FILES_${PN} += "${datadir}/automake* ${d
FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-include automake.inc
+require automake.inc
do_install () {
oe_runmake 'DESTDIR=${D}' install
============================================================
--- packages/automake/automake_1.8.2.bb 3f4d87879e54e1703caea774cfad8394c7d71006
+++ packages/automake/automake_1.8.2.bb 1c5a44a120611970d67fdea2251c242f41e00d13
@@ -12,7 +12,7 @@ FILES_${PN} += "${datadir}/automake* ${d
FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-include automake.inc
+require automake.inc
do_install () {
oe_runmake 'DESTDIR=${D}' install
============================================================
--- packages/automake/automake_1.8.4.bb d22999d65fa763fd7bbb54f863eea39bb1349181
+++ packages/automake/automake_1.8.4.bb dbead0a20da4dd0a1a52eab2aad0e1ac11c422c6
@@ -12,7 +12,7 @@ FILES_${PN} += "${datadir}/automake* ${d
FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-include automake.inc
+require automake.inc
do_install () {
oe_runmake 'DESTDIR=${D}' install
============================================================
--- packages/automake/automake_1.9.2.bb 8cacf7931bffb7a025dcafdeb51a0708e4ebaea3
+++ packages/automake/automake_1.9.2.bb ab1f6496236c98997ade050efd382f7e6426213d
@@ -13,7 +13,7 @@ FILES_${PN} += "${datadir}/automake* ${d
FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-include automake.inc
+require automake.inc
do_install () {
oe_runmake 'DESTDIR=${D}' install
============================================================
--- packages/automake/automake_1.9.3.bb 1655d741639d65fa23f895f7d55c35e9ab1726ce
+++ packages/automake/automake_1.9.3.bb 81107ea0266d47b1464c3374ef1d5bc7ddc26f8c
@@ -14,7 +14,7 @@ FILES_${PN} += "${datadir}/automake* ${d
export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-include automake.inc
+require automake.inc
do_install () {
oe_runmake 'DESTDIR=${D}' install
============================================================
--- packages/bison/bison-native_2.0.bb 00c8dff49e5bc2b414fc2178605eb18827746bb7
+++ packages/bison/bison-native_2.0.bb b6d1493bb6da2e6d2f4f9b09dc4ad1ce1a80bed9
@@ -1,4 +1,4 @@
-include bison_${PV}.bb
+require bison_${PV}.bb
SECTION = "devel"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
S = "${WORKDIR}/bison-${PV}"
============================================================
--- packages/bitbake/bitbake.inc f602660d9fabc00e4ead2b5e514d763e4f04f812
+++ packages/bitbake/bitbake.inc 1ec8827a3545b200cb256ae42d5aefe5305549f2
@@ -9,4 +9,3 @@ SUMMARY = "BitBake build tool"
LICENSE = "GPL MIT"
SECTION = "devel"
SUMMARY = "BitBake build tool"
-PACKAGE_ARCH = "all"
============================================================
--- packages/bitbake/bitbake_svn.bb 5e34a07b5f525ce75f41fa38c7fdacf1208482ed
+++ packages/bitbake/bitbake_svn.bb 6cdb9bfa6f653b95ff5f6a458df92834ad0a8bdb
@@ -1,4 +1,4 @@
-include bitbake.inc
+require bitbake.inc
# Don't use the tip of svn by default
DEFAULT_PREFERENCE = "-1"
@@ -13,4 +13,4 @@ inherit distutils
inherit distutils
+require bitbake-package.inc
-include bitbake-package.inc
============================================================
--- packages/file/file-native_4.16.bb f4972b86f91e250ba146fb090ae2571099c11e70
+++ packages/file/file-native_4.16.bb 52c595486a06f4aa70368b84f336a7fdb554ca69
@@ -1,4 +1,4 @@
-include file_${PV}.bb
+require file_${PV}.bb
inherit native
# avoid dependency loop
============================================================
--- packages/flex/flex-native_2.5.31.bb 7f446a012d83345d631f0452fe31a50bc8d90c78
+++ packages/flex/flex-native_2.5.31.bb adf1d2f20b3e013b75d5258e3759d0a41d433b2c
@@ -1,4 +1,4 @@
-include flex.inc
+require flex.inc
inherit native
PR = "r2"
============================================================
--- packages/flex/flex_2.5.31.bb ad347b5c44cd993bdca3020c868d24f3903b61e4
+++ packages/flex/flex_2.5.31.bb be13de28f4a853d9ceb301e497768769c52fc22a
@@ -1,4 +1,4 @@
-include flex.inc
+require flex.inc
PR = "r4"
SRC_URI += "file://include.patch;patch=1"
============================================================
--- packages/gettext/gettext-native_0.14.1.bb d20c54959fa6f40cb27c408881a25d653900c358
+++ packages/gettext/gettext-native_0.14.1.bb %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list