[oe-commits] org.oe.dev merge of '6dbd04de03e12a60f6719db5199c0a399d2c1279'

woglinde2 commit oe at amethyst.openembedded.net
Sat Jul 19 14:07:36 UTC 2008


merge of '6dbd04de03e12a60f6719db5199c0a399d2c1279'
     and 'be3713b5fac2aae7f226418a48c1d67f2f902170'

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: f3ac5a85359b5afd8e975af40c079c9e9befef63
ViewMTN: http://monotone.openembedded.org/revision/info/f3ac5a85359b5afd8e975af40c079c9e9befef63
Files:
1
packages/alsa/alsa-lib/fix_libmath.patch
packages/alsa/alsa-versym.inc
packages/alsa/alsa-lib_1.0.15.bb
conf/bitbake.conf
conf/machine/h6300.conf
conf/machine/htckaiser.conf
conf/machine/include/tune-arm1136jf-s.inc
conf/machine/include/tune-arm920t.inc
conf/machine/include/tune-arm926ejs.inc
conf/machine/include/tune-arm9tdmi.inc
conf/machine/include/tune-armv7.inc
conf/machine/include/tune-at32ap7000.inc
conf/machine/include/tune-athlonmp.inc
conf/machine/include/tune-c3.inc
conf/machine/include/tune-cortexa8.inc
conf/machine/include/tune-cortexm1.inc
conf/machine/include/tune-cortexm3.inc
conf/machine/include/tune-cortexr4.inc
conf/machine/include/tune-ep9312.inc
conf/machine/include/tune-geodelx.inc
conf/machine/include/tune-iwmmxt.inc
conf/machine/include/tune-pentium.inc
conf/machine/include/tune-pentium4c.inc
conf/machine/include/tune-pentiumpro.inc
conf/machine/include/tune-ppc405.inc
conf/machine/include/tune-ppc440.inc
conf/machine/include/tune-ppc440e.inc
conf/machine/include/tune-ppc603e.inc
conf/machine/include/tune-ppce300c2.inc
conf/machine/include/tune-ppce300c3.inc
conf/machine/include/tune-ppce500.inc
conf/machine/include/tune-supersparc.inc
conf/machine/include/tune-xscale.inc
Diffs:

#
# mt diff -r6dbd04de03e12a60f6719db5199c0a399d2c1279 -rf3ac5a85359b5afd8e975af40c079c9e9befef63
#
#
#
# add_file "packages/alsa/alsa-lib/fix_libmath.patch"
#  content [55db68aef57ed41890c8977335a2793c5f1b491b]
# 
# add_file "packages/alsa/alsa-versym.inc"
#  content [957d390b9f2272ea29b2cb24f7e33f8ca8843d15]
# 
# patch "packages/alsa/alsa-lib_1.0.15.bb"
#  from [2e5d3f16e83a9a0cb85abacde76247c41534ae70]
#    to [60c8a8b8e5ce8fd414421ff9168d97354fbfa467]
#
============================================================
--- packages/alsa/alsa-lib/fix_libmath.patch	55db68aef57ed41890c8977335a2793c5f1b491b
+++ packages/alsa/alsa-lib/fix_libmath.patch	55db68aef57ed41890c8977335a2793c5f1b491b
@@ -0,0 +1,17 @@
+Index: alsa-lib-1.0.15/configure.in
+===================================================================
+--- alsa-lib-1.0.15.orig/configure.in	2007-10-15 10:45:26.000000000 +0200
++++ alsa-lib-1.0.15/configure.in	2008-07-19 15:51:34.177119589 +0200
+@@ -191,9 +191,9 @@
+   AC_MSG_RESULT(no)
+ fi
+ 
+-ALSA_DEPLIBS=""
+-if test "$softfloat" != "yes"; then
+-  ALSA_DEPLIBS="-lm"
++ALSA_DEPLIBS="-lm"
++if test "$softfloat" = "yes"; then
++   AC_CHECK_LIB([m], [floor], , [ALSA_DEPLIBS=""])
+ fi
+ 
+ dnl Check for libdl
============================================================
--- packages/alsa/alsa-versym.inc	957d390b9f2272ea29b2cb24f7e33f8ca8843d15
+++ packages/alsa/alsa-versym.inc	957d390b9f2272ea29b2cb24f7e33f8ca8843d15
@@ -0,0 +1,21 @@
+
+def get_alsa_versym_setting(bb, d):
+    # Versioned symbols don't work propery with uClibc
+    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+        return "--with-versioned=no"
+    return ""
+    
+
+def get_alsa_versym_setting(bb, d):
+    # Versioned symbols don't work propery with uClibc
+    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+        return "--with-versioned=no"
+    return ""
+    
+
+def get_alsa_versym_setting(bb, d):
+    # Versioned symbols don't work propery with uClibc
+    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+        return "--with-versioned=no"
+    return ""
+    
============================================================
--- packages/alsa/alsa-lib_1.0.15.bb	2e5d3f16e83a9a0cb85abacde76247c41534ae70
+++ packages/alsa/alsa-lib_1.0.15.bb	60c8a8b8e5ce8fd414421ff9168d97354fbfa467
@@ -2,6 +2,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
+PR = "1"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
@@ -10,15 +11,24 @@ SRC_URI = "ftp://ftp.alsa-project.org/pu
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1"
+           file://fix-tstamp-declaration.patch;patch=1 \
+	   file://fix_libmath.patch;patch=1 \
+	  "
 
 inherit autotools pkgconfig
 
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
+
+
 require alsa-fpu.inc
 EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
 
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
 
+require alsa-versym.inc
+EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} "
+
+
 do_stage () {
 	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
 	install -d ${STAGING_INCDIR}/alsa/sound


#
# mt diff -rbe3713b5fac2aae7f226418a48c1d67f2f902170 -rf3ac5a85359b5afd8e975af40c079c9e9befef63
#
#
#
# patch "conf/bitbake.conf"
#  from [d8122151bbc194ee830cb666879ae90585f1b985]
#    to [287e3cad95f04e47a69434591772c958ef52287a]
# 
# patch "conf/machine/h6300.conf"
#  from [4c6c8fdebd9d8dc8eb6354ae169862cc5662c63a]
#    to [25fcc50c0fe6e96973533769fde4fa84f5c444b4]
# 
# patch "conf/machine/htckaiser.conf"
#  from [daed3c3a075ede90bec1e6302f724e7805689cfb]
#    to [be5f366c2e3de340ebc77ef4a63925013bd38587]
# 
# patch "conf/machine/include/tune-arm1136jf-s.inc"
#  from [eb16d920f5e4b5c23d60ef7eeb3c4dc30ba84f11]
#    to [eeabfb8ca8e9b43a510bfb95672dd61af159f39b]
# 
# patch "conf/machine/include/tune-arm920t.inc"
#  from [90b20a2b9db56011eaade4f5842ba8b4a8584126]
#    to [078a0be6224342dbb8942bdaa046bdaf106229fb]
# 
# patch "conf/machine/include/tune-arm926ejs.inc"
#  from [c76a174d9339a3b351d5f39e293bf9321cac008f]
#    to [917d7cb1d978da4bb54649d5cc03ab70eb34dcd8]
# 
# patch "conf/machine/include/tune-arm9tdmi.inc"
#  from [6f184e7d957f36ba2cef5212bd97661f00637342]
#    to [79388d34696a51ce5e20545788b9154842262651]
# 
# patch "conf/machine/include/tune-armv7.inc"
#  from [eccbfaf3855e34b17e836c1e89b4f4588912aa43]
#    to [02a24b2d622b88cf8f3545e09374f8c8d44b56de]
# 
# patch "conf/machine/include/tune-at32ap7000.inc"
#  from [e5e452b43a8e689bee19061e97ddd89ec6361c59]
#    to [5c4d1566b157fd0987ba15c70d27a0f5dc3a1221]
# 
# patch "conf/machine/include/tune-athlonmp.inc"
#  from [417e31e4adfc225d7259a61cf933a33081657be0]
#    to [cf481b8b27709088470b1e2d8d8110b09255ae88]
# 
# patch "conf/machine/include/tune-c3.inc"
#  from [7f5fa845c925213467714b5e7e083c12f7cf2d50]
#    to [d4f6f979474fef3c968049f88aa4cc5195353e35]
# 
# patch "conf/machine/include/tune-cortexa8.inc"
#  from [1c7e4d80a5ad5dd0a7deedf35e59fa26a9322663]
#    to [6dd225734aacdd77430796fb5870fec44969139d]
# 
# patch "conf/machine/include/tune-cortexm1.inc"
#  from [13409d125701403164cfa8aa723a0e603f7c0e51]
#    to [781d073e5fd6f5efc763d49b4838eea45a8a331e]
# 
# patch "conf/machine/include/tune-cortexm3.inc"
#  from [08cd5bf4032e4527974beda7b6affd3e8a081461]
#    to [0d0d35e79c8e6d4afc4fd525d86c74b57ac4f3a3]
# 
# patch "conf/machine/include/tune-cortexr4.inc"
#  from [2a64e3403d59721dce5277b438e1ffef0d568cb0]
#    to [cf6809f02db7fe43e6a93e8f637e5bc908b53892]
# 
# patch "conf/machine/include/tune-ep9312.inc"
#  from [72bb08d58889d339fd041d3a15f8fc03f0677d03]
#    to [bb9f59576209e0caa33503e1cc107287e45bd412]
# 
# patch "conf/machine/include/tune-geodelx.inc"
#  from [25436a51b6bd7bb8892229e11052a1dd1760a76f]
#    to [ee9e22451e15e82954bb02ecad0d41f0eb517463]
# 
# patch "conf/machine/include/tune-iwmmxt.inc"
#  from [de3adeef9a3b58de9d665740bc34e7d915542fb2]
#    to [5eac3196d9a9bce2f909c057d3ba2a64f8be7227]
# 
# patch "conf/machine/include/tune-pentium.inc"
#  from [6b9ddb65b3836bda362d3f5eda88fcca7899e5b4]
#    to [bec2d2950a44bdd1d982fe397345f7bb5f6b2f08]
# 
# patch "conf/machine/include/tune-pentium4c.inc"
#  from [6d4588e5e8c363a3883c76fc49befb8c4e75864d]
#    to [3eef3e10f61acaabbaf4a3fa90097b5f2c9267ae]
# 
# patch "conf/machine/include/tune-pentiumpro.inc"
#  from [540ece970e180900a0c64ce122b9579a22601580]
#    to [e71f5e42fa08687887c6c965d233a0e9ac2c9433]
# 
# patch "conf/machine/include/tune-ppc405.inc"
#  from [ed3e43d2b699eab49eb09fad69013a7777c0b1e3]
#    to [5c16538bcc6b4fa6c74575a70e2eeb2c89a9da71]
# 
# patch "conf/machine/include/tune-ppc440.inc"
#  from [a9bf4faa977b4a302cb780a3560ef2cec7542640]
#    to [e6b653056fdb4700cec63bfaf1d88c9aba620066]
# 
# patch "conf/machine/include/tune-ppc440e.inc"
#  from [b52a0440649cab37e1d9363690240ff022f24e0f]
#    to [71d305b0f0a1bcc67a2080caafeb23c280f22fdf]
# 
# patch "conf/machine/include/tune-ppc603e.inc"
#  from [c5a3c033be3008ddd74e246788d6b1789e69b8c4]
#    to [fa522a632c8dd938b60ed2be2ed24f81a51be81c]
# 
# patch "conf/machine/include/tune-ppce300c2.inc"
#  from [673bf0b7a98457941bf9c81d3200edb7cfe48a1a]
#    to [5c55ef430c49351dd88911b6e0a18b9e9466e9e3]
# 
# patch "conf/machine/include/tune-ppce300c3.inc"
#  from [886a0b2ab156004ece209d03675294bedf89a5cf]
#    to [b51135585d48585711544177a34347a2758b2001]
# 
# patch "conf/machine/include/tune-ppce500.inc"
#  from [dc1f3774a47c6b3da11f89eb426d4d2e4446aa64]
#    to [d21c10e46e71714eb948daf82e662dc31254a82f]
# 
# patch "conf/machine/include/tune-supersparc.inc"
#  from [a0ecec3fc1f272c9d6ab5f54e6aa7f4917af49f0]
#    to [beb4137221c3eaba7ec06d113dbfd502a577990d]
# 
# patch "conf/machine/include/tune-xscale.inc"
#  from [07b8a81fcb5c2ae0981da2f8244cf7272bae3fe2]
#    to [c27a9b91cc15ed49012c56156613d5312ceb197f]
#
============================================================
--- conf/bitbake.conf	d8122151bbc194ee830cb666879ae90585f1b985
+++ conf/bitbake.conf	287e3cad95f04e47a69434591772c958ef52287a
@@ -86,7 +86,8 @@ TARGET_CC_ARCH = ""
 TARGET_PREFIX = "${TARGET_SYS}-"
 TARGET_CC_ARCH = ""
 
-PACKAGE_ARCH = "${HOST_ARCH}"
+BASE_PACKAGE_ARCH = "${HOST_ARCH}"
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
 PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
 
@@ -160,6 +161,7 @@ PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${
 MULTI_PROVIDER_WHITELIST = "virtual/libintl"
 
 PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES_DYNAMIC = "${PN}-locale-*"
 FILES = ""
 
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
@@ -380,6 +382,7 @@ ALLOWED_FLAGS = "-O -mcpu -march -pipe"
 ALLOWED_FLAGS = "-O -mcpu -march -pipe"
 
 # Pass parallel make options to the compile task only
+EXTRA_OEMAKE_prepend_task_do_compile = "${PARALLEL_MAKE} "
 EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} "
 
 ##################################################################
============================================================
--- conf/machine/h6300.conf	4c6c8fdebd9d8dc8eb6354ae169862cc5662c63a
+++ conf/machine/h6300.conf	25fcc50c0fe6e96973533769fde4fa84f5c444b4
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_ARCH = "arm"
+BASE_PACKAGE_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
============================================================
--- conf/machine/htckaiser.conf	daed3c3a075ede90bec1e6302f724e7805689cfb
+++ conf/machine/htckaiser.conf	be5f366c2e3de340ebc77ef4a63925013bd38587
@@ -13,7 +13,7 @@ FEED_ARCH = "armv6"
  
 TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
 FEED_ARCH = "armv6"
-PACKAGE_ARCH = "armv6"
+BASE_PACKAGE_ARCH = "armv6"
  
 
 IMAGE_FSTYPES ?= "tar.gz cpio.gz"
============================================================
--- conf/machine/include/tune-arm1136jf-s.inc	eb16d920f5e4b5c23d60ef7eeb3c4dc30ba84f11
+++ conf/machine/include/tune-arm1136jf-s.inc	eeabfb8ca8e9b43a510bfb95672dd61af159f39b
@@ -1,3 +1,3 @@ FEED_ARCH = "armv6"
 TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv6"
+BASE_PACKAGE_ARCH = "armv6"
-PACKAGE_ARCH = "armv6"
============================================================
--- conf/machine/include/tune-arm920t.inc	90b20a2b9db56011eaade4f5842ba8b4a8584126
+++ conf/machine/include/tune-arm920t.inc	078a0be6224342dbb8942bdaa046bdaf106229fb
@@ -1,4 +1,4 @@ FEED_ARCH = "armv4t"
 FEED_ARCH = "armv4t"
-PACKAGE_ARCH = "armv4t" 
+BASE_PACKAGE_ARCH = "armv4t" 
 TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
 
============================================================
--- conf/machine/include/tune-arm926ejs.inc	c76a174d9339a3b351d5f39e293bf9321cac008f
+++ conf/machine/include/tune-arm926ejs.inc	917d7cb1d978da4bb54649d5cc03ab70eb34dcd8
@@ -4,4 +4,4 @@ TARGET_CC_ARCH = "-march=armv5te -mtune=
 #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
 # For gcc 4.x you need:
 TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
+BASE_PACKAGE_ARCH = "armv5te"
-PACKAGE_ARCH = "armv5te"
============================================================
--- conf/machine/include/tune-arm9tdmi.inc	6f184e7d957f36ba2cef5212bd97661f00637342
+++ conf/machine/include/tune-arm9tdmi.inc	79388d34696a51ce5e20545788b9154842262651
@@ -1,3 +1,3 @@ FEED_ARCH = "armv4t"
 FEED_ARCH = "armv4t"
-PACKAGE_ARCH = "armv4t"
+BASE_PACKAGE_ARCH = "armv4t"
 TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"
============================================================
--- conf/machine/include/tune-armv7.inc	eccbfaf3855e34b17e836c1e89b4f4588912aa43
+++ conf/machine/include/tune-armv7.inc	02a24b2d622b88cf8f3545e09374f8c8d44b56de
@@ -3,4 +3,4 @@ FEED_ARCH = "armv7"
 # This will NOT compile programs in 'ARM' mode, which is what you really want
 TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv7"
+BASE_PACKAGE_ARCH = "armv7"
-PACKAGE_ARCH = "armv7"
============================================================
--- conf/machine/include/tune-at32ap7000.inc	e5e452b43a8e689bee19061e97ddd89ec6361c59
+++ conf/machine/include/tune-at32ap7000.inc	5c4d1566b157fd0987ba15c70d27a0f5dc3a1221
@@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=ap"
 TARGET_CC_ARCH = "-march=ap"
-PACKAGE_ARCH = "avr32"
+BASE_PACKAGE_ARCH = "avr32"
 FEED_ARCH = "avr32"
============================================================
--- conf/machine/include/tune-athlonmp.inc	417e31e4adfc225d7259a61cf933a33081657be0
+++ conf/machine/include/tune-athlonmp.inc	cf481b8b27709088470b1e2d8d8110b09255ae88
@@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=i686"
 TARGET_CC_ARCH = "-march=i686"
-PACKAGE_ARCH = "i686"
+BASE_PACKAGE_ARCH = "i686"
 FEED_ARCH = "i686"
============================================================
--- conf/machine/include/tune-c3.inc	7f5fa845c925213467714b5e7e083c12f7cf2d50
+++ conf/machine/include/tune-c3.inc	d4f6f979474fef3c968049f88aa4cc5195353e35
@@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=c3 -mtune=c3"
 TARGET_CC_ARCH = "-march=c3 -mtune=c3"
-PACKAGE_ARCH = "i586"
+BASE_PACKAGE_ARCH = "i586"
 FEED_ARCH = "i586"
============================================================
--- conf/machine/include/tune-cortexa8.inc	1c7e4d80a5ad5dd0a7deedf35e59fa26a9322663
+++ conf/machine/include/tune-cortexa8.inc	6dd225734aacdd77430796fb5870fec44969139d
@@ -5,4 +5,4 @@ FEED_ARCH = "armv7a"
 
 TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
 FEED_ARCH = "armv7a"
+BASE_PACKAGE_ARCH = "armv7a"
-PACKAGE_ARCH = "armv7a"
============================================================
--- conf/machine/include/tune-cortexm1.inc	13409d125701403164cfa8aa723a0e603f7c0e51
+++ conf/machine/include/tune-cortexm1.inc	781d073e5fd6f5efc763d49b4838eea45a8a331e
@@ -1,3 +1,3 @@ FEED_ARCH = "armv6"
 TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv6"
+BASE_PACKAGE_ARCH = "armv6"
-PACKAGE_ARCH = "armv6"
============================================================
--- conf/machine/include/tune-cortexm3.inc	08cd5bf4032e4527974beda7b6affd3e8a081461
+++ conf/machine/include/tune-cortexm3.inc	0d0d35e79c8e6d4afc4fd525d86c74b57ac4f3a3
@@ -1,4 +1,4 @@ FEED_ARCH = "armv7"
 # valid options for -march: `armv7', `armv7-m'
 TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv7"
+BASE_PACKAGE_ARCH = "armv7"
-PACKAGE_ARCH = "armv7"
============================================================
--- conf/machine/include/tune-cortexr4.inc	2a64e3403d59721dce5277b438e1ffef0d568cb0
+++ conf/machine/include/tune-cortexr4.inc	cf6809f02db7fe43e6a93e8f637e5bc908b53892
@@ -1,4 +1,4 @@ FEED_ARCH = "armv7"
 # valid options for -march: `armv7', `armv7-r'
 TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv7"
+BASE_PACKAGE_ARCH = "armv7"
-PACKAGE_ARCH = "armv7"
============================================================
--- conf/machine/include/tune-ep9312.inc	72bb08d58889d339fd041d3a15f8fc03f0677d03
+++ conf/machine/include/tune-ep9312.inc	bb9f59576209e0caa33503e1cc107287e45bd412
@@ -2,6 +2,6 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=e
 # add "-mfp=maverick" for newer gcc versions > 4.0
 
 #set arch to ep9312 for all generated packages
-PACKAGE_ARCH = "ep9312"
+BASE_PACKAGE_ARCH = "ep9312"
 FEED_ARCH = "ep9312"
 
============================================================
--- conf/machine/include/tune-geodelx.inc	25436a51b6bd7bb8892229e11052a1dd1760a76f
+++ conf/machine/include/tune-geodelx.inc	ee9e22451e15e82954bb02ecad0d41f0eb517463
@@ -2,6 +2,6 @@ TARGET_CC_ARCH = "-march=k6-2"
 # in older versions k6-2 is closest
 #
 TARGET_CC_ARCH = "-march=k6-2"
-PACKAGE_ARCH = "geode"
+BASE_PACKAGE_ARCH = "geode"
 FEED_ARCH = "geode"
 
============================================================
--- conf/machine/include/tune-iwmmxt.inc	de3adeef9a3b58de9d665740bc34e7d915542fb2
+++ conf/machine/include/tune-iwmmxt.inc	5eac3196d9a9bce2f909c057d3ba2a64f8be7227
@@ -1,7 +1,7 @@ TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iw
 # Configurations for the Intel PXA27x Appications Processor Family. 
 # Please use tune-xscale for PXA255/PXA26x based processors.
 TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH = "iwmmxt"
+BASE_PACKAGE_ARCH = "iwmmxt"
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
 FEED_ARCH = "iwmmxt"
 
============================================================
--- conf/machine/include/tune-pentium.inc	6b9ddb65b3836bda362d3f5eda88fcca7899e5b4
+++ conf/machine/include/tune-pentium.inc	bec2d2950a44bdd1d982fe397345f7bb5f6b2f08
@@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentium"
 TARGET_CC_ARCH = "-march=pentium"
-PACKAGE_ARCH = "i586"
+BASE_PACKAGE_ARCH = "i586"
 FEED_ARCH = "i586"
 
============================================================
--- conf/machine/include/tune-pentium4c.inc	6d4588e5e8c363a3883c76fc49befb8c4e75864d
+++ conf/machine/include/tune-pentium4c.inc	3eef3e10f61acaabbaf4a3fa90097b5f2c9267ae
@@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=prescott"
 TARGET_CC_ARCH = "-march=prescott"
-PACKAGE_ARCH = "i686p4c"
+BASE_PACKAGE_ARCH = "i686p4c"
 
============================================================
--- conf/machine/include/tune-pentiumpro.inc	540ece970e180900a0c64ce122b9579a22601580
+++ conf/machine/include/tune-pentiumpro.inc	e71f5e42fa08687887c6c965d233a0e9ac2c9433
@@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentiumpro"
 TARGET_CC_ARCH = "-march=pentiumpro"
-PACKAGE_ARCH = "i686"
+BASE_PACKAGE_ARCH = "i686"
 FEED_ARCH = "i686"
 
============================================================
--- conf/machine/include/tune-ppc405.inc	ed3e43d2b699eab49eb09fad69013a7777c0b1e3
+++ conf/machine/include/tune-ppc405.inc	5c16538bcc6b4fa6c74575a70e2eeb2c89a9da71
@@ -1,5 +1,5 @@ TARGET_CC_ARCH = "-mcpu=405"
 #default to soft-floats if distro/machine/local.conf don't define anything else
 TARGET_FPU   ?=  "soft"
 TARGET_CC_ARCH = "-mcpu=405"
-PACKAGE_ARCH = "ppc405"
+BASE_PACKAGE_ARCH = "ppc405"
 FEED_ARCH = "ppc405"
============================================================
--- conf/machine/include/tune-ppc440.inc	a9bf4faa977b4a302cb780a3560ef2cec7542640
+++ conf/machine/include/tune-ppc440.inc	e6b653056fdb4700cec63bfaf1d88c9aba620066
@@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=440"
 TARGET_CC_ARCH = "-mcpu=440"
-PACKAGE_ARCH = "ppc440"
+BASE_PACKAGE_ARCH = "ppc440"
 FEED_ARCH = "ppc440"
============================================================
--- conf/machine/include/tune-ppc440e.inc	b52a0440649cab37e1d9363690240ff022f24e0f
+++ conf/machine/include/tune-ppc440e.inc	71d305b0f0a1bcc67a2080caafeb23c280f22fdf
@@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=440fp -mhard-flo
 TARGET_CC_ARCH = "-mcpu=440fp -mhard-float"
-PACKAGE_ARCH = "ppc440e"
+BASE_PACKAGE_ARCH = "ppc440e"
 FEED_ARCH = "ppc440e"
============================================================
--- conf/machine/include/tune-ppc603e.inc	c5a3c033be3008ddd74e246788d6b1789e69b8c4
+++ conf/machine/include/tune-ppc603e.inc	fa522a632c8dd938b60ed2be2ed24f81a51be81c
@@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=603e -mhard-floa
 TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
-PACKAGE_ARCH = "ppc603e"
+BASE_PACKAGE_ARCH = "ppc603e"
 FEED_ARCH = "ppc603e"
============================================================
--- conf/machine/include/tune-ppce300c2.inc	673bf0b7a98457941bf9c81d3200edb7cfe48a1a
+++ conf/machine/include/tune-ppce300c2.inc	5c55ef430c49351dd88911b6e0a18b9e9466e9e3
@@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=e300c2"
 TARGET_CC_ARCH = "-mcpu=e300c2"
-PACKAGE_A%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list