[oe-commits] org.oe.dev merge of '9bb9579fd7698d62103b3f88f6d0910f8ba1e53d'
ifaistos commit
oe at amethyst.openembedded.net
Thu May 1 13:48:10 UTC 2008
merge of '9bb9579fd7698d62103b3f88f6d0910f8ba1e53d'
and 'd8f83de5204562e9c23bd329d59d35006de0f0f8'
Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: eacaa9da1bf50bb36867c5d528b4a52bf1d77861
ViewMTN: http://monotone.openembedded.org/revision/info/eacaa9da1bf50bb36867c5d528b4a52bf1d77861
Files:
1
packages/asterisk/asterisk-1.4.10
packages/asterisk/asterisk-1.4.10/Makefile.patch
packages/asterisk/asterisk-1.4.10/init
packages/asterisk/asterisk-1.4.10/logrotate
packages/asterisk/asterisk-1.4.10/sounds.xml.patch
packages/asterisk/asterisk-1.4.10/volatiles
packages/asterisk/asterisk-1.4.11
packages/asterisk/asterisk-1.4.11/Makefile.patch
packages/asterisk/asterisk-1.4.11/init
packages/asterisk/asterisk-1.4.11/logrotate
packages/asterisk/asterisk-1.4.11/sounds.xml.patch
packages/asterisk/asterisk-1.4.11/volatiles
packages/asterisk/asterisk-1.6.0-beta6
packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch
packages/asterisk/asterisk-1.6.0-beta6/init
packages/asterisk/asterisk-1.6.0-beta6/logrotate
packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch
packages/asterisk/asterisk-1.6.0-beta6/volatiles
packages/asterisk/asterisk_1.4.10.bb
packages/asterisk/asterisk_1.4.11.bb
packages/asterisk/asterisk_1.6.0-beta6.bb
packages/asterisk/asterisk-1.2.28
packages/asterisk/asterisk-1.4.19.1
packages/asterisk/asterisk-1.6.0-beta8
packages/u-boot/u-boot-1.1.4/at32stk1000
conf/machine/d201gly2.conf
conf/machine/include/tune-pentium4c.inc
packages/asterisk/asterisk-1.2.28/asterisk.patch
packages/asterisk/asterisk-1.2.28/enable-speex.patch
packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch
packages/asterisk/asterisk-1.2.28/uclibc-dns.patch
packages/asterisk/asterisk-1.4.19.1/Makefile.patch
packages/asterisk/asterisk-1.4.19.1/init
packages/asterisk/asterisk-1.4.19.1/logrotate
packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch
packages/asterisk/asterisk-1.4.19.1/volatiles
packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch
packages/asterisk/asterisk-1.6.0-beta8/init
packages/asterisk/asterisk-1.6.0-beta8/logrotate
packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch
packages/asterisk/asterisk-1.6.0-beta8/volatiles
packages/asterisk/asterisk_1.2.28.bb
packages/asterisk/asterisk_1.4.19.1.bb
packages/asterisk/asterisk_1.6.0-beta8.bb
packages/gpsd/gpsd_2.37.bb
packages/python/python-setuptools-native_0.6c6.bb
packages/u-boot/u-boot-1.1.4/at32stk1000/ap7000-add-spi-device-and-lcdc-base-address.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-define-for-sdram-test.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-framebuffer-address.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-spi-initcalls.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-system-manager-header-file.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-add-lcd-and-spi-to-config.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-ltv350qv-display-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-spi-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/avr32-boards-fix-flash-read.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/cmd-bmp-add-gzip-compressed-bmp.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/fix-mmc-data-timeout.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/lcd-add-24-bpp-support-and-atmel-lcdc-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/lcdc-driver-for-avr32.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/libavr32-add-spi-and-lcd-board-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/spi-driver-for-avr32.patch
classes/setuptools.bbclass
conf/distro/generic-uclibc.conf
conf/distro/oplinux-uclibc.conf
packages/gpgme/gpgme.inc
packages/gpgme/gpgme_1.0.0.bb
packages/gpgme/gpgme_1.0.3.bb
packages/gpgme/gpgme_1.1.4.bb
packages/python/python-2.5-manifest.inc
packages/python/python-setuptools_0.6c6.bb
packages/python/python-simplejson_1.7.1.bb
packages/python/python_2.5.2.bb
packages/u-boot/u-boot_1.1.4.bb
packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine
Diffs:
#
# mt diff -r9bb9579fd7698d62103b3f88f6d0910f8ba1e53d -reacaa9da1bf50bb36867c5d528b4a52bf1d77861
#
#
#
# delete "packages/asterisk/asterisk-1.4.10"
#
# delete "packages/asterisk/asterisk-1.4.10/Makefile.patch"
#
# delete "packages/asterisk/asterisk-1.4.10/init"
#
# delete "packages/asterisk/asterisk-1.4.10/logrotate"
#
# delete "packages/asterisk/asterisk-1.4.10/sounds.xml.patch"
#
# delete "packages/asterisk/asterisk-1.4.10/volatiles"
#
# delete "packages/asterisk/asterisk-1.4.11"
#
# delete "packages/asterisk/asterisk-1.4.11/Makefile.patch"
#
# delete "packages/asterisk/asterisk-1.4.11/init"
#
# delete "packages/asterisk/asterisk-1.4.11/logrotate"
#
# delete "packages/asterisk/asterisk-1.4.11/sounds.xml.patch"
#
# delete "packages/asterisk/asterisk-1.4.11/volatiles"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/init"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/logrotate"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/volatiles"
#
# delete "packages/asterisk/asterisk_1.4.10.bb"
#
# delete "packages/asterisk/asterisk_1.4.11.bb"
#
# delete "packages/asterisk/asterisk_1.6.0-beta6.bb"
#
# add_dir "packages/asterisk/asterisk-1.2.28"
#
# add_dir "packages/asterisk/asterisk-1.4.19.1"
#
# add_dir "packages/asterisk/asterisk-1.6.0-beta8"
#
# add_dir "packages/u-boot/u-boot-1.1.4/at32stk1000"
#
# add_file "conf/machine/d201gly2.conf"
# content [7e34b9738d6c1869f61708e1fec04db2564f9d89]
#
# add_file "conf/machine/include/tune-pentium4c.inc"
# content [6d4588e5e8c363a3883c76fc49befb8c4e75864d]
#
# add_file "packages/asterisk/asterisk-1.2.28/asterisk.patch"
# content [cd980f6cc48c01f2394a731d2cf247809e5c2231]
#
# add_file "packages/asterisk/asterisk-1.2.28/enable-speex.patch"
# content [123420f2bb25f198d687ae8cfad1eef6e90725bb]
#
# add_file "packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch"
# content [750cd99592c157b993f2ccb9f63edbe274d9edd1]
#
# add_file "packages/asterisk/asterisk-1.2.28/uclibc-dns.patch"
# content [9dbcc47d6cfeefd0f4c1071f982806f49ffc262d]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/Makefile.patch"
# content [ce55873b5855c020f4d4e987a386223d1a211911]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/init"
# content [66ddc677ff3831fb4be746a9222e69f65a2c6a22]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/logrotate"
# content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch"
# content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/volatiles"
# content [66814aff0fd07e02c83bf90010a95c0845067557]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch"
# content [83b3bcf804f60d8438696a8b8e54698c9c1dff09]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/init"
# content [ab9f4c6af832cc4a94d2a5e256988be381675969]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/logrotate"
# content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch"
# content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/volatiles"
# content [66814aff0fd07e02c83bf90010a95c0845067557]
#
# add_file "packages/asterisk/asterisk_1.2.28.bb"
# content [59adcd07ce9843da6a5209dbe439320b4e024fbc]
#
# add_file "packages/asterisk/asterisk_1.4.19.1.bb"
# content [04072cabaeacd15aab238077b9b08e107ebec94b]
#
# add_file "packages/asterisk/asterisk_1.6.0-beta8.bb"
# content [8fbf9884c3ab370083c2125640d541c7f0fc0388]
#
# add_file "packages/gpsd/gpsd_2.37.bb"
# content [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
#
# add_file "packages/python/python-setuptools-native_0.6c6.bb"
# content [37e35eebe4105610cad978ad7a92f12a2b9095d1]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/ap7000-add-spi-device-and-lcdc-base-address.patch"
# content [264148f2ada6a081fe0b2e071b0edc80d5bb26d3]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-define-for-sdram-test.patch"
# content [aacb40f62692f7f12d2594259831635533ea5254]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-framebuffer-address.patch"
# content [0dc5903c7cb85cbda2a744d9ded9a86258089d87]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-spi-initcalls.patch"
# content [758d34baadad1b76b6ed1ef398709646af1defbf]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-system-manager-header-file.patch"
# content [0905f155e05eba575a0685462783708b8098af55]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-add-lcd-and-spi-to-config.patch"
# content [174d54cdd69afafd05d72a0fd0c8751d0976a599]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-ltv350qv-display-support.patch"
# content [c9bf5bf83f39696ee9f981ed85f847334f28c2b1]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-spi-support.patch"
# content [a1ebfc54a394239909ae56d84e754d7ec80bbac3]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/avr32-boards-fix-flash-read.patch"
# content [0687dbba73b78ddd353f834a58a26b02ce8f8ef8]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/cmd-bmp-add-gzip-compressed-bmp.patch"
# content [80f5abd078487b50df179cad3b3d1a0f382b56ae]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/fix-mmc-data-timeout.patch"
# content [70b1b5f471490abbf21b2c173a9863794616545c]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/lcd-add-24-bpp-support-and-atmel-lcdc-support.patch"
# content [055ca79e80417f03df63174afb7a707a2e98e5a6]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/lcdc-driver-for-avr32.patch"
# content [87dc7c19ee654a3223802b457bb82c44ff3c515e]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/libavr32-add-spi-and-lcd-board-support.patch"
# content [f9cdf2cc1db97cbdcfbb811df1067fb7baec5542]
#
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/spi-driver-for-avr32.patch"
# content [aaf3a5bcf5a60041e4da853c72c9417adca86a12]
#
# patch "classes/setuptools.bbclass"
# from [f0a6d602e9af754216e3616efb17302d0116fe3b]
# to [de18f3769a72fd6890b414d5ad97471bd58ce683]
#
# patch "conf/distro/generic-uclibc.conf"
# from [4b6c77936994e0b78819a2d3d1f6a9e68262429f]
# to [86d233ffa29fe7b850743b7e58fde2e37d4d6f5a]
#
# patch "conf/distro/oplinux-uclibc.conf"
# from [4d4e43572601100e99436c766449cf726eab951e]
# to [ded77d3149a141de656d62e5c1ed7e161f1e500d]
#
# patch "packages/gpgme/gpgme.inc"
# from [36ab592ddc0e1147ff7e3515f783b2f135903201]
# to [03ed85bb76b7f3e2a6baf511ed9e657e18bdf6c4]
#
# patch "packages/gpgme/gpgme_1.0.0.bb"
# from [4efb9b2188257cb57c38b41a4054c273d6d32d3c]
# to [1945518e229ff69cc0f28fb3a1f516569ff9d592]
#
# patch "packages/gpgme/gpgme_1.0.3.bb"
# from [4efb9b2188257cb57c38b41a4054c273d6d32d3c]
# to [1945518e229ff69cc0f28fb3a1f516569ff9d592]
#
# patch "packages/gpgme/gpgme_1.1.4.bb"
# from [1945518e229ff69cc0f28fb3a1f516569ff9d592]
# to [1f23f8d93534d9cbc07caca5c802ff0d984aadbd]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [ce2d4136b474c7f902281410e54cde0b27751287]
# to [e3df18f8f3a8373fd0bccb992c74a16321f20256]
#
# patch "packages/python/python-setuptools_0.6c6.bb"
# from [57994d92ba3eec5b7d6f145f3d08241becb3a6dc]
# to [074cb8e81cb89426c6d897caeb5fd18c68571c9a]
#
# patch "packages/python/python-simplejson_1.7.1.bb"
# from [8890cca59935f213dfae3a402765e7bad90c9a89]
# to [4abda6be3039a1c47c3bdc6c4c287078ff32fbe8]
#
# patch "packages/python/python_2.5.2.bb"
# from [43c9ad955282b5022b3a3db8b5b179589957f666]
# to [3ca57f8a30e412707c0107dff460e0343840d9f1]
#
# patch "packages/u-boot/u-boot_1.1.4.bb"
# from [d038552bd2f9296f6e46ab33c2c4ebb364477fec]
# to [f33798683ca5789d2b3c96f26805a5f148b78370]
#
============================================================
--- conf/machine/d201gly2.conf 7e34b9738d6c1869f61708e1fec04db2564f9d89
+++ conf/machine/d201gly2.conf 7e34b9738d6c1869f61708e1fec04db2564f9d89
@@ -0,0 +1,33 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: D201GLY2
+#@DESCRIPTION: Machine configuration for Intel D201GLY2 board
+
+
+TARGET_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686 i686p4c"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux
+KERNEL_IMAGETYPE = "bzImage"
+OLDEST_KERNEL = "2.6.17"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER="xserver-kdrive-sis"
+
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_TASK_PROVIDER = "task-base"
+
+udevdir = "/dev"
+
+
+#tune for P4 celeron cpu
+require conf/machine/include/tune-pentium4c.inc
============================================================
--- conf/machine/include/tune-pentium4c.inc 6d4588e5e8c363a3883c76fc49befb8c4e75864d
+++ conf/machine/include/tune-pentium4c.inc 6d4588e5e8c363a3883c76fc49befb8c4e75864d
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=prescott"
+PACKAGE_ARCH = "i686p4c"
+
============================================================
--- packages/asterisk/asterisk-1.2.28/asterisk.patch cd980f6cc48c01f2394a731d2cf247809e5c2231
+++ packages/asterisk/asterisk-1.2.28/asterisk.patch cd980f6cc48c01f2394a731d2cf247809e5c2231
@@ -0,0 +1,221 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- asterisk-1.2.9.1/./Makefile~asterisk
++++ asterisk-1.2.9.1/./Makefile
+@@ -331,7 +331,7 @@
+ ASTCFLAGS+= $(TRACE_FRAMES)
+ ASTCFLAGS+= $(MALLOC_DEBUG)
+ ASTCFLAGS+= $(BUSYDETECT)
+-ASTCFLAGS+= $(OPTIONS)
++#ASTCFLAGS+= $(OPTIONS)
+ ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ ASTCFLAGS+= -fomit-frame-pointer
+ endif
+@@ -347,12 +347,12 @@
+ netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
+ cryptostub.o
+
+-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),)
+ OBJS+= poll.o
+ ASTCFLAGS+=-DPOLLCOMPAT
+ endif
+
+-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),)
+ OBJS+= dlfcn.o
+ ASTCFLAGS+=-DDLFCNCOMPAT
+ endif
+@@ -397,7 +397,7 @@
+ endif
+
+ ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
+- CFLAGS+=$(ASTCFLAGS)
++override CFLAGS+=$(ASTCFLAGS)
+ endif
+
+ # This is used when generating the doxygen documentation
+@@ -519,7 +519,7 @@
+ fi
+ rm -f include/asterisk/build.h.tmp
+ $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
+
+ muted: muted.o
+ $(CC) $(AUDIO_LIBS) -o muted muted.o
+--- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk
++++ asterisk-1.2.9.1/codecs/gsm/Makefile
+@@ -51,7 +51,7 @@
+ ifneq (${PROC},ppc)
+ ifneq (${PROC},ppc64)
+ ifneq (${PROC},s390)
+-OPTIMIZE+=-march=$(PROC)
++#OPTIMIZE+=-march=$(PROC)
+ endif
+ endif
+ endif
+@@ -243,7 +243,7 @@
+ ifneq (${PROC},arm)
+ ifneq ($(shell uname -m), parisc)
+ ifneq ($(shell uname -m),s390)
+-GSM_SOURCES+= $(SRC)/k6opt.s
++#GSM_SOURCES+= $(SRC)/k6opt.s
+ endif
+ endif
+ endif
+@@ -309,7 +309,7 @@
+ ifneq ($(shell uname -m), armv4l)
+ ifneq ($(shell uname -m), parisc)
+ ifneq ($(shell uname -m),s390)
+-GSM_OBJECTS+= $(SRC)/k6opt.o
++#GSM_OBJECTS+= $(SRC)/k6opt.o
+ endif
+ endif
+ endif
+--- asterisk-1.2.9.1/res/Makefile~asterisk
++++ asterisk-1.2.9.1/res/Makefile
+@@ -89,7 +89,7 @@
+ fi
+
+ res_crypto.so: res_crypto.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS)
+
+ clean:
+ rm -f *.so *.o .depend
+--- asterisk-1.2.9.1/channels/Makefile~asterisk
++++ asterisk-1.2.9.1/channels/Makefile
+@@ -73,7 +73,7 @@
+ SOLINK+=-lrt
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),)
+ CHANNEL_LIBS+=chan_phone.so
+ endif
+
+@@ -88,16 +88,16 @@
+
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),)
+ CHANNEL_LIBS+=chan_alsa.so
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),)
+ CFLAGS+=-DZAPATA_PRI
+ ZAPPRI=-lpri
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),)
+ CFLAGS+=-DZAPATA_R2
+ ZAPR2=-lmfcr2
+ endif
+@@ -110,7 +110,7 @@
+ endif
+
+ ifndef WITHOUT_ZAPTEL
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/zaptel.h),)
+ ifeq (${OSARCH},NetBSD)
+ SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
+ endif
+@@ -122,7 +122,7 @@
+ endif
+ endif # WITHOUT_ZAPTEL
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vpbapi.h),)
+ CHANNEL_LIBS+=chan_vpb.so
+ CFLAGS+=-DLINUX
+ endif
+@@ -137,7 +137,7 @@
+
+ ZAPDIR=/usr/lib
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/nbs.h),)
+ CHANNEL_LIBS+=chan_nbs.so
+ endif
+
+@@ -158,7 +158,7 @@
+ rm -f busy.h ringtone.h gentone gentone-ulaw
+
+ %.so : %.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS}
+
+ ifneq ($(wildcard .depend),)
+ include .depend
+@@ -215,7 +215,7 @@
+ chan_alsa.o: $(ALSA_SRC)
+
+ chan_alsa.so: chan_alsa.o
+- $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl
++ $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl $(LDFLAGS)
+
+ chan_nbs.so: chan_nbs.o
+ $(CC) $(SOLINK) -o $@ $< -lnbs
+--- asterisk-1.2.9.1/pbx/Makefile~asterisk
++++ asterisk-1.2.9.1/pbx/Makefile
+@@ -59,7 +59,7 @@
+ $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
+
+ pbx_dundi.so: dundi-parser.o pbx_dundi.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB}
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS)
+
+ %.moc : %.h
+ $(MOC) $< -o $@
+--- asterisk-1.2.9.1/formats/Makefile~asterisk
++++ asterisk-1.2.9.1/formats/Makefile
+@@ -25,7 +25,7 @@
+ #
+ # OGG/Vorbis format
+ #
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vorbis/codec.h),)
+ FORMAT_LIBS+=format_ogg_vorbis.so
+ endif
+
+@@ -57,7 +57,7 @@
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm
+
+ format_ogg_vorbis.so : format_ogg_vorbis.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm $(LDFLAGS)
+
+ install: all
+ for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+--- asterisk-1.2.9.1/utils/Makefile~asterisk
++++ asterisk-1.2.9.1/utils/Makefile
+@@ -22,11 +22,11 @@
+
+ TARGET=stereorize streamplayer
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/popt.h),)
+ TARGET+=smsq
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/newt.h),)
+ TARGET+=astman
+ endif
+
+@@ -64,7 +64,7 @@%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd8f83de5204562e9c23bd329d59d35006de0f0f8 -reacaa9da1bf50bb36867c5d528b4a52bf1d77861
#
#
#
# patch "packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine"
# from [6eee945f4f60a18b512aca572845079a33e5fc2c]
# to [982b86121dc5785e0853eea3beeb64e885a28474]
#
============================================================
--- packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine 6eee945f4f60a18b512aca572845079a33e5fc2c
+++ packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine 982b86121dc5785e0853eea3beeb64e885a28474
@@ -1,5 +1,6 @@
#
# Automatically generated make config: don't edit
+# Thu May 1 16:06:57 2008
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -9,8 +10,10 @@ TARGET_avr32=y
# TARGET_e1 is not set
# TARGET_frv is not set
# TARGET_h8300 is not set
+# TARGET_hppa is not set
# TARGET_i386 is not set
# TARGET_i960 is not set
+# TARGET_ia64 is not set
# TARGET_m68k is not set
# TARGET_microblaze is not set
# TARGET_mips is not set
@@ -21,30 +24,174 @@ TARGET_avr32=y
# TARGET_sh64 is not set
# TARGET_sparc is not set
# TARGET_v850 is not set
+# TARGET_vax is not set
# TARGET_x86_64 is not set
#
# Target Architecture Features and Options
#
-HAVE_ELF=y
TARGET_ARCH="avr32"
-ARCH_SUPPORTS_BIG_ENDIAN=y
-UCLIBC_COMPLETELY_PIC=y
-CONFIG_AP7000=y
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_AVR32_AP7=y
LINKRELAX=y
-# ARCH_LITTLE_ENDIAN is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
ARCH_BIG_ENDIAN=y
-# ARCH_HAS_NO_MMU is not set
+
+#
+# Using Big Endian
+#
ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=n
+# UCLIBC_HAS_FPU is not set
UCLIBC_HAS_SOFT_FLOAT=y
DO_C99_MATH=y
-C_SYMBOL_PREFIX=""
-KERNEL_HEADERS="Dummy value, correct value substituted by uclibc.inc"
+KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/avr32-angstrom-linux-uclibc/usr/include"
HAVE_DOT_CONFIG=y
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+# DOPIC is not set
+# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+FORCE_SHAREABLE_TEXT_SEGMENTS=y
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+PTHREADS_DEBUG_SUPPORT=y
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_HAS_SHADOW=y
+# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+#
+# Networking Support
+#
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+# UCLIBC_HAS_REENTRANT_RPC is not set
+# UCLIBC_USE_NETLINK is not set
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="//usr"
+
+#
+# Security options
+#
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
More information about the Openembedded-commits
mailing list