packages: all salute the passing of avr32

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2015-02-14 10:23:06 +01:00 committed by Thomas Petazzoni
parent 188c0a3168
commit 9863553fe8
86 changed files with 27 additions and 3528 deletions

View File

@ -6,10 +6,6 @@ config BR2_PACKAGE_AICCU
depends on BR2_USE_MMU # fork()
# Uses dn_skipname(), only available since 0.9.33
depends on !BR2_UCLIBC_VERSION_0_9_31
# AVR32 only has uClibc 0.9.31, so there's no way it can build
# due to the lack of dn_skipname(), even with external
# toolchains.
depends on !BR2_avr32
# Triggers the _gp link issue
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
@ -31,6 +27,5 @@ config BR2_PACKAGE_AICCU
comment "aiccu needs a toolchain w/ IPv6, wchar, threads"
depends on BR2_USE_MMU
depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
depends on !BR2_avr32
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405

View File

@ -1,91 +0,0 @@
diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h alsa-lib-1.0.18/src/pcm/pcm_local.h
--- alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h 2009-01-31 11:02:12.000000000 +0100
+++ alsa-lib-1.0.18/src/pcm/pcm_local.h 2009-01-31 11:03:24.000000000 +0100
@@ -611,6 +611,13 @@
snd_pcm_hw_param_t var);
int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params,
snd_pcm_hw_param_t var, unsigned int val, int dir);
+
+#if defined(AVR32_INLINE_BUG)
+int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
+ snd_pcm_format_t val);
+int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
+ snd_pcm_subformat_t val);
+#else
static inline int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
snd_pcm_format_t val)
{
@@ -624,7 +631,7 @@
return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
(unsigned long) val, 0);
}
-
+#endif
int _snd_pcm_hw_param_set_min(snd_pcm_hw_params_t *params,
snd_pcm_hw_param_t var, unsigned int val, int dir);
int _snd_pcm_hw_param_set_max(snd_pcm_hw_params_t *params,
diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c alsa-lib-1.0.18/src/pcm/pcm_route.c
--- alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c 2009-01-31 11:02:12.000000000 +0100
+++ alsa-lib-1.0.18/src/pcm/pcm_route.c 2009-01-31 11:03:18.000000000 +0100
@@ -26,6 +26,7 @@
*
*/
+
#include <byteswap.h>
#include <math.h>
#include "pcm_local.h"
@@ -106,6 +107,23 @@
#endif /* DOC_HIDDEN */
+
+#if defined(AVR32_INLINE_BUG)
+int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
+ snd_pcm_format_t val)
+{
+ return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_FORMAT,
+ (unsigned long) val, 0);
+}
+
+int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
+ snd_pcm_subformat_t val)
+{
+ return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
+ (unsigned long) val, 0);
+}
+#endif
+
static void snd_pcm_route_convert1_zero(const snd_pcm_channel_area_t *dst_area,
snd_pcm_uframes_t dst_offset,
const snd_pcm_channel_area_t *src_areas ATTRIBUTE_UNUSED,
@@ -483,6 +501,8 @@
snd_pcm_uframes_t frames,
snd_pcm_route_params_t *params)
{
+#if defined(AVR32_INLINE_BUG)
+#endif
unsigned int dst_channel;
snd_pcm_route_ttable_dst_t *dstp;
const snd_pcm_channel_area_t *dst_area;
@@ -551,8 +571,20 @@
_snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,
&saccess_mask);
if (route->sformat != SND_PCM_FORMAT_UNKNOWN) {
+#if defined(AVR32_INLINE_BUG)
+/* Start of of problem */
+#endif
_snd_pcm_hw_params_set_format(sparams, route->sformat);
_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);
+#if 0
+ _snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_FORMAT,
+ (unsigned long) route->sformat, 0);
+ _snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_SUBFORMAT,
+ (unsigned long) SND_PCM_SUBFORMAT_STD, 0);
+#endif
+#if defined(AVR32_INLINE_BUG)
+/* End of problem */
+#endif
}
if (route->schannels >= 0) {
_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_CHANNELS,

View File

@ -50,10 +50,6 @@ ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y)
ALSA_LIB_CONF_OPTS += --disable-old-symbols
endif
ifeq ($(BR2_avr32),y)
ALSA_LIB_CFLAGS += -DAVR32_INLINE_BUG
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
ALSA_LIB_CONF_OPTS += \
--with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \

View File

@ -8,7 +8,6 @@ config BR2_PACKAGE_AVRDUDE
depends on BR2_LARGEFILE # elfutils
depends on BR2_USE_WCHAR # elfutils
depends on !BR2_STATIC_LIBS # elfutils
depends on !BR2_avr32 # elfutils
depends on !BR2_bfin # elfutils
help
avrdude is a programmer for Atmel AVR microcontrollers
@ -18,5 +17,4 @@ config BR2_PACKAGE_AVRDUDE
comment "avrdude needs a toolchain w/ threads, largefile, wchar, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
depends on !BR2_avr32
depends on !BR2_bfin

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_BDWGC_ARCH_SUPPORTS
bool
default y
depends on BR2_arm || BR2_armeb || BR2_avr32 || BR2_i386 \
depends on BR2_arm || BR2_armeb || BR2_i386 \
|| BR2_mips || BR2_mipsel || BR2_powerpc || BR2_sh \
|| BR2_sparc || BR2_x86_64

View File

@ -4,7 +4,7 @@ config BR2_PACKAGE_BLKTRACE
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL
# Because of libaio arch depends
depends on \
BR2_arm || BR2_armeb || BR2_avr32 || BR2_i386 || \
BR2_arm || BR2_armeb || BR2_i386 || \
BR2_m68k || BR2_mips || BR2_mipsel || BR2_powerpc || \
BR2_sparc || BR2_x86_64
select BR2_PACKAGE_LIBAIO

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_BLUEZ5_UTILS
bool "bluez-utils 5.x"
depends on !BR2_avr32
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
depends on BR2_USE_MMU # dbus

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_BLUEZ_UTILS
bool "bluez-utils"
depends on !BR2_avr32
depends on !BR2_STATIC_LIBS
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
@ -47,5 +46,5 @@ config BR2_PACKAGE_BLUEZ_UTILS_GATT
endif
comment "bluez-utils needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_BTRFS_PROGS
depends on BR2_USE_WCHAR # util-linux
depends on BR2_USE_MMU # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_avr32 # toolchain issues
select BR2_PACKAGE_ACL
select BR2_PACKAGE_ATTR
select BR2_PACKAGE_E2FSPROGS
@ -20,6 +19,5 @@ config BR2_PACKAGE_BTRFS_PROGS
comment "btrfs-progs needs a toolchain w/ largefile, wchar, threads"
depends on BR2_USE_MMU
depends on !BR2_avr32
depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS

View File

@ -251,7 +251,6 @@ config BR2_PACKAGE_COLLECTD_MYSQL
depends on BR2_INSTALL_LIBSTDCPP # mysql
depends on BR2_USE_MMU # mysql
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
depends on !BR2_avr32 # mysql
select BR2_PACKAGE_MYSQL
help
Connects to a MySQL database and issues a "show status" command.

View File

@ -3,7 +3,6 @@ config BR2_PACKAGE_CONNMAN
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_IPTABLES
depends on !BR2_avr32 # no inotify_init1
depends on BR2_USE_WCHAR # libglib2
depends on BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
@ -66,5 +65,5 @@ config BR2_PACKAGE_CONNMAN_CLIENT
endif # BR2_PACKAGE_CONNMAN
comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver, dynamic library"
depends on BR2_USE_MMU && !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_CWIID
bool "cwiid"
depends on !BR2_avr32 # bluez_utils
depends on !BR2_STATIC_LIBS # bluez_utils
depends on BR2_USE_WCHAR # bluez_utils -> libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> dbus, alsa-lib, libglib2
@ -27,5 +26,4 @@ endif
comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar"
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_avr32
depends on !BR2_USE_MMU

View File

@ -24,13 +24,11 @@ config BR2_PACKAGE_DOVECOT_MYSQL
select BR2_PACKAGE_MYSQL
depends on BR2_INSTALL_LIBSTDCPP # mysql
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
depends on !BR2_avr32 # mysql
help
Enable MySQL support.
comment "mysql support needs a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_avr32
config BR2_PACKAGE_DOVECOT_OPENSSL
bool "openssl support"

View File

@ -13,10 +13,8 @@ DROPWATCH_LICENSE_FILES = COPYING
# libbfd may be linked to libintl
# Ugly... but LDFLAGS are hardcoded anyway
#
# Also: always need to add -liberty to hardcoded LDFLAGS for avr32
DROPWATCH_LDFLAGS = \
$(TARGET_LDFLAGS) -lbfd -liberty -lreadline -lnl-3 -lnl-genl-3 \
$(TARGET_LDFLAGS) -lbfd -lreadline -lnl-3 -lnl-genl-3 \
-lpthread -lncurses -lm
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)

View File

@ -1,25 +0,0 @@
When building for avr32, the build fails as follows.
cc1: error: unrecognized command line option "-Wno-packed-bitfield-compat"
An example of an autobuild failure arising from this is the following.
http://autobuild.buildroot.net/results/92e/92e472004812a3616f62d766a9ea07a997a66e89/
Clearly, not all toolchains provide a gcc that understands
the -Wno-packed-bitfield-compat flag; remove usage of this flag.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
diff -Nurp a/util/scan/Makefile b/util/scan/Makefile
--- a/util/scan/Makefile 2013-11-24 17:04:10.000000000 +0000
+++ b/util/scan/Makefile 2013-12-13 09:37:11.967975173 +0000
@@ -14,7 +14,7 @@ inst_bin = $(binaries)
removing = atsc_psip_section.c atsc_psip_section.h
-CPPFLAGS += -Wno-packed-bitfield-compat -D__KERNEL_STRICT_NAMES
+CPPFLAGS += -D__KERNEL_STRICT_NAMES
.PHONY: all

View File

@ -50,7 +50,7 @@ config BR2_PACKAGE_E2FSPROGS_E2UNDO
config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
bool "e4defrag"
depends on !BR2_avr32 && !BR2_nios2 # fallocate not implemented
depends on !BR2_nios2 # fallocate not implemented
depends on !BR2_TOOLCHAIN_USES_UCLIBC # sync_file_range not impl
comment "e4defrag needs an (e)glibc or musl toolchain"

View File

@ -9,7 +9,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
select BR2_PACKAGE_GETENT
depends on BR2_USE_WCHAR # gettext
depends on BR2_USE_MMU # keyutils
depends on !BR2_avr32 && !BR2_microblaze # keyutils
depends on !BR2_microblaze # keyutils
depends on BR2_LARGEFILE # libnss
depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr
depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
@ -31,7 +31,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
http://ecryptfs.org
comment "ecryptfs-utils needs a toolchain w/ largefile, threads, wchar, dynamic library"
depends on !BR2_avr32 && !BR2_microblaze
depends on !BR2_microblaze
depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
depends on BR2_USE_MMU
depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \

View File

@ -5,7 +5,6 @@ config BR2_PACKAGE_EXPEDITE
select BR2_PACKAGE_LIBEET
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
depends on !BR2_avr32 # libevas
help
Expedite is the official Evas benchmark tool. It can test different
engines, such as X11, XRender, OpenGL (also ES variant), SDL,
@ -15,4 +14,3 @@ config BR2_PACKAGE_EXPEDITE
comment "expedite needs a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP
depends on !BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_avr32

View File

@ -39,10 +39,8 @@ config BR2_PACKAGE_LIBECORE_EVAS
bool "libecore Evas support"
select BR2_PACKAGE_LIBEVAS
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_avr32 # libevas
comment "evas support needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_avr32 # libevas
endif # BR2_PACKAGE_LIBECORE

View File

@ -16,7 +16,6 @@ if BR2_PACKAGE_LIBEDBUS
config BR2_PACKAGE_LIBEDBUS_BLUEZ
bool "bluez support"
depends on !BR2_avr32 # bluez_utils
depends on !BR2_STATIC_LIBS # bluez_utils
depends on BR2_USE_WCHAR # bluez_utils -> glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> glib2
@ -25,7 +24,6 @@ config BR2_PACKAGE_LIBEDBUS_BLUEZ
Bluetooth support.
comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
config BR2_PACKAGE_LIBEDBUS_CONNMAN

View File

@ -1,5 +1,4 @@
comment "libedje needs a toolchain w/ threads"
depends on !BR2_avr32
depends on !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_LIBEDJE
@ -11,7 +10,6 @@ config BR2_PACKAGE_LIBEDJE
select BR2_PACKAGE_LIBEMBRYO
select BR2_PACKAGE_LIBEVAS
select BR2_PACKAGE_LUA
depends on !BR2_avr32 # libevas
depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
help
A graphical layout and animation library for animated

View File

@ -1,5 +1,4 @@
comment "libelementary needs a toolchain w/ threads"
depends on !BR2_avr32
depends on !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_LIBELEMENTARY
@ -8,7 +7,6 @@ config BR2_PACKAGE_LIBELEMENTARY
select BR2_PACKAGE_LIBEVAS
select BR2_PACKAGE_LIBECORE
select BR2_PACKAGE_LIBEDJE
depends on !BR2_avr32 # libevas
depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
help
Elementary is a widget toolkit and EFL wrapper and convenience

View File

@ -1,5 +1,4 @@
comment "libethumb needs a toolchain w/ threads"
depends on !BR2_avr32
depends on !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_LIBETHUMB
@ -9,7 +8,6 @@ config BR2_PACKAGE_LIBETHUMB
select BR2_PACKAGE_LIBECORE
select BR2_PACKAGE_LIBECORE_EVAS
select BR2_PACKAGE_LIBEDJE
depends on !BR2_avr32 # libevas
depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
help
Ethumb is a library for generating thumbnail images of documents.

View File

@ -1,10 +1,8 @@
comment "libevas needs a toolchain w/ threads"
depends on !BR2_avr32
depends on !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_LIBEVAS
bool "libevas"
depends on !BR2_avr32 # no epoll_create1 or inotify_init1
# libevas should normally build without threads, but due to a
# build issue when the async preloader is disabled, which is
# needed when no threads are available, we don't allow evas to

View File

@ -1,5 +1,4 @@
comment "elfutils needs a toolchain w/ largefile, wchar, dynamic library"
depends on !BR2_avr32
depends on !BR2_bfin
depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
@ -10,9 +9,6 @@ config BR2_PACKAGE_ELFUTILS
depends on BR2_LARGEFILE
depends on BR2_USE_WCHAR
depends on !BR2_STATIC_LIBS
# canonicalize_file_name() not available on uClibc 0.9.31, used
# only for AVR32
depends on !BR2_avr32
# build issue caused by the _ prefix used on blackfin for
# assembly symbols
depends on !BR2_bfin

View File

@ -26,7 +26,6 @@ config BR2_PACKAGE_ENLIGHTENMENT
# libedbus -> dbus, efl libraries
depends on BR2_USE_MMU
depends on BR2_PACKAGE_XORG7
depends on !BR2_avr32 # libevas
# libevas-generic-loaders-svg -> librsvg -> pango -> cairo
depends on BR2_ARCH_HAS_ATOMICS
help
@ -42,4 +41,3 @@ comment "enlightenment needs a toolchain w/ wchar, C++, threads"
depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
depends on BR2_ARCH_HAS_ATOMICS
depends on !BR2_avr32

View File

@ -1,48 +0,0 @@
diff -ur fbv-1.0b/fb_display.c fbv-1.0b-avr32/fb_display.c
--- fbv-1.0b/fb_display.c 2004-09-07 14:09:43.000000000 +0200
+++ fbv-1.0b-avr32/fb_display.c 2006-05-04 13:30:25.000000000 +0200
@@ -276,9 +276,6 @@
for(i = 0; i < yc; i++, fbptr += scr_xs * cpp, imptr += pic_xs * cpp)
memcpy(fbptr, imptr, xc * cpp);
- if(cpp == 1)
- set8map(fh, &map_back);
-
munmap(fb, scr_xs * scr_ys * cpp);
}
@@ -293,17 +290,17 @@
inline static unsigned short make15color(unsigned char r, unsigned char g, unsigned char b)
{
return (
- (((r >> 3) & 31) << 10) |
+ (((r >> 3) & 31)) |
(((g >> 3) & 31) << 5) |
- ((b >> 3) & 31) );
+ ((b >> 3) & 31) << 10);
}
inline static unsigned short make16color(unsigned char r, unsigned char g, unsigned char b)
{
return (
- (((r >> 3) & 31) << 11) |
- (((g >> 2) & 63) << 5) |
- ((b >> 3) & 31) );
+ (((r >> 3) & 31)) |
+ (((g >> 3) & 31) << 5) |
+ ((b >> 3) & 31) << 10);
}
void* convertRGB2FB(int fh, unsigned char *rgbbuff, unsigned long count, int bpp, int *cpp)
@@ -342,9 +339,9 @@
*cpp = 4;
i_fbbuff = (unsigned int *) malloc(count * sizeof(unsigned int));
for(i = 0; i < count ; i++)
- i_fbbuff[i] = ((rgbbuff[i*3] << 16) & 0xFF0000) |
+ i_fbbuff[i] = ((rgbbuff[i*3+2] << 16) & 0xFF0000) |
((rgbbuff[i*3+1] << 8) & 0xFF00) |
- (rgbbuff[i*3+2] & 0xFF);
+ (rgbbuff[i*3] & 0xFF);
fbbuff = (void *) i_fbbuff;
break;
default:

View File

@ -11,7 +11,7 @@ config BR2_PACKAGE_GADGETFS_TEST_USE_AIO
select BR2_PACKAGE_LIBAIO
# libaio is available only on few architectures
depends on \
BR2_arm || BR2_armeb || BR2_avr32 || BR2_i386 || \
BR2_arm || BR2_armeb || BR2_i386 || \
BR2_m68k || BR2_mips || BR2_mipsel || BR2_powerpc || \
BR2_sparc || BR2_x86_64
help

View File

@ -174,9 +174,6 @@ config BR2_PACKAGE_GPSD_NMEA2000
bool "NMEA2000"
select BR2_PACKAGE_GPSD_NAVCOM
select BR2_PACKAGE_GPSD_AIVDM
# uClibc 0.9.31, used on AVR32, does not have the necessary
# CAN definitions.
depends on !BR2_avr32
help
NMEA2000/CAN support

View File

@ -12,7 +12,7 @@ GSTREAMER_INSTALL_STAGING = YES
# Checking if unaligned memory access works correctly cannot be done when cross
# compiling. For the following architectures there is no information available
# in the configure script.
ifeq ($(BR2_arc)$(BR2_avr32)$(BR2_xtensa)$(BR2_microblaze),y)
ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze),y)
GSTREAMER_CONF_ENV = as_cv_unaligned_access=no
endif
ifeq ($(BR2_aarch64),y)

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_GST1_LIBAV
bool "gst1-libav"
depends on !BR2_avr32 # binary too large, relocations don't fit
select BR2_PACKAGE_GST1_PLUGINS_BASE
help
GStreamer plugin (formerly gst-ffmpeg).

View File

@ -371,7 +371,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
bool "wayland"
depends on !BR2_avr32 # wayland
depends on !BR2_STATIC_LIBS # wayland
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
select BR2_PACKAGE_WAYLAND

View File

@ -14,7 +14,7 @@ GSTREAMER1_LICENSE = LGPLv2+ LGPLv2.1+
# Checking if unaligned memory access works correctly cannot be done when cross
# compiling. For the following architectures there is no information available
# in the configure script.
ifeq ($(BR2_arc)$(BR2_avr32)$(BR2_xtensa)$(BR2_microblaze),y)
ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze),y)
GSTREAMER1_CONF_ENV = as_cv_unaligned_access=no
endif
ifeq ($(BR2_aarch64),y)

View File

@ -3,7 +3,6 @@ config BR2_PACKAGE_IPUTILS
select BR2_PACKAGE_OPENSSL if BR2_INET_IPV6
depends on BR2_USE_MMU # fork()
# requires dn_comp (only available in since uclibc 0.9.33)
depends on !BR2_avr32
depends on !BR2_UCLIBC_VERSION_0_9_31
help
This package is set of small useful utilities for Linux networking.

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_KEYUTILS
bool "keyutils"
depends on !BR2_avr32 && !BR2_microblaze
depends on !BR2_microblaze
depends on BR2_USE_MMU # fork()
help
These tools are used to control the key management system

View File

@ -1,122 +0,0 @@
Add AVR32 support to libaio
Taken from OpenWRT repository.
--- a/src/libaio.h
+++ b/src/libaio.h
@@ -107,6 +107,10 @@ typedef enum io_iocb_cmd {
# else
# error "neither mipseb nor mipsel?"
# endif
+#elif defined(__avr32__) /* big endian, 32 bits */
+#define PADDED(x, y) unsigned y; x
+#define PADDEDptr(x, y) unsigned y; x
+#define PADDEDul(x, y) unsigned y; unsigned long x;
#else
#error endian?
#endif
--- /dev/null
+++ b/src/syscall-avr32.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2007 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#define __NR_io_setup 197
+#define __NR_io_destroy 198
+#define __NR_io_getevents 199
+#define __NR_io_submit 200
+#define __NR_io_cancel 201
+
+#define io_syscall1(type,fname,sname,type1,arg1) \
+type fname(type1 arg1) \
+{ \
+ register long __r12 __asm__("r12") = (long)arg1; \
+ register long __res_r12 __asm__("r12"); \
+ register long __scno __asm__("r8") = __NR_##sname; \
+ __asm__ __volatile__("scall" \
+ : "=r"(__res_r12) \
+ : "0"(__r12), "r"(__scno) \
+ : "memory"); \
+ return (type) __res_r12; \
+}
+
+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \
+type fname(type1 arg1, type2 arg2) \
+{ \
+ register long __r12 __asm__("r12") = (long)arg1; \
+ register long __r11 __asm__("r11") = (long)arg2; \
+ register long __res_r12 __asm__("r12"); \
+ register long __scno __asm__("r8") = __NR_##sname; \
+ __asm__ __volatile__("scall" \
+ : "=r"(__res_r12) \
+ : "0"(__r12), "r"(__r11), "r"(__scno) \
+ : "memory"); \
+ return (type) __res_r12; \
+}
+
+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \
+type fname(type1 arg1, type2 arg2, type3 arg3) \
+{ \
+ register long __r12 __asm__("r12") = (long)arg1; \
+ register long __r11 __asm__("r11") = (long)arg2; \
+ register long __r10 __asm__("r10") = (long)arg3; \
+ register long __res_r12 __asm__("r12"); \
+ register long __scno __asm__("r8") = __NR_##sname; \
+ __asm__ __volatile__("scall" \
+ : "=r"(__res_r12) \
+ : "0"(__r12), "r"(__r11), "r"(__r10), \
+ "r"(__scno) \
+ : "memory"); \
+ return (type) __res_r12; \
+}
+
+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
+{ \
+ register long __r12 __asm__("r12") = (long)arg1; \
+ register long __r11 __asm__("r11") = (long)arg2; \
+ register long __r10 __asm__("r10") = (long)arg3; \
+ register long __r9 __asm__("r9") = (long)arg4; \
+ register long __res_r12 __asm__("r12"); \
+ register long __scno __asm__("r8") = __NR_##sname; \
+ __asm__ __volatile__("scall" \
+ : "=r"(__res_r12) \
+ : "0"(__r12), "r"(__r11), "r"(__r10), \
+ "r"(__r9), "r"(__scno) \
+ : "memory"); \
+ return (type) __res_r12; \
+}
+
+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
+{ \
+ register long __r12 __asm__("r12") = (long)arg1; \
+ register long __r11 __asm__("r11") = (long)arg2; \
+ register long __r10 __asm__("r10") = (long)arg3; \
+ register long __r9 __asm__("r9") = (long)arg4; \
+ register long __r5 __asm__("r5") = (long)arg5; \
+ register long __res_r12 __asm__("r12"); \
+ register long __scno __asm__("r8") = __NR_##sname; \
+ __asm__ __volatile__("scall" \
+ : "=r"(__res_r12) \
+ : "0"(__r12), "r"(__r11), "r"(__r10), \
+ "r"(__r9), "r"(__r5), "r"(__scno) \
+ : "memory"); \
+ return (type) __res_r12; \
+}
--- a/src/syscall.h
+++ b/src/syscall.h
@@ -32,6 +32,8 @@
#include "syscall-parisc.h"
#elif defined(__mips__)
#include "syscall-mips.h"
+#elif defined(__avr32__)
+#include "syscall-avr32.h"
#else
#error "add syscall-arch.h"
#endif

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_LIBAIO
bool "libaio"
depends on \
BR2_arm || BR2_armeb || BR2_avr32 || BR2_i386 || \
BR2_arm || BR2_armeb || BR2_i386 || \
BR2_m68k || BR2_mips || BR2_mipsel || BR2_powerpc || \
BR2_sparc || BR2_x86_64
help

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBCAP_NG
bool "libcap-ng"
depends on !BR2_avr32 # lacks TLS
help
The libcap-ng library is intended to make programming with
posix capabilities much easier than the traditional libcap

View File

@ -1,22 +0,0 @@
Do not use -Wno-psabi warning, not available on old g++
AVR32 uses a very old g++ version, which does not implement the
-Wno-psabi warning flag. This patch simply removes this warning flag
from the libcec build. It can be dropped if only gcc 4.5+ versions are
supported in Buildroot.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,7 @@
use_udev="no"
use_adapter_detection="yes"
use_lockdev="no"
-SUPPRESS_MANGLING_WARNINGS=" -Wno-psabi"
+SUPPRESS_MANGLING_WARNINGS=""
case "${host}" in
*-*-linux*)
## search for udev if pkg-config was found

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_LIBEV
bool "libev"
# needs memory fences
depends on !(BR2_avr32 || BR2_bfin)
depends on !BR2_bfin
help
Userspace library for handling asynchronous notifications

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBMAD
bool "libmad"
select BR2_PACKAGE_LIBMAD_ASO if BR2_avr32
help
High-quality MPEG audio decoder. All computations are performed
with fixed-point integer arithmetic, making it ideal for systems

View File

@ -21,9 +21,4 @@ LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos
LIBMICROHTTPD_CONF_OPTS += --disable-https
endif
ifeq ($(BR2_avr32),y)
# no epoll_create1
LIBMICROHTTPD_CONF_OPTS += --disable-epoll
endif
$(eval $(autotools-package))

View File

@ -4,8 +4,6 @@ config BR2_PACKAGE_LIBSECRET
depends on BR2_USE_WCHAR # gettext dep in libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2
# Triggers an internal compiler error on AVR32
depends on !BR2_avr32
help
libsecret is a library for storing and retrieving passwords and other
secrets. It communicates with the "Secret Service" using DBus.
@ -15,6 +13,5 @@ config BR2_PACKAGE_LIBSECRET
https://wiki.gnome.org/Libsecret
comment "libsecret needs a toolchain w/ wchar, threads"
depends on !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

View File

@ -1,33 +0,0 @@
From 60d329bb2b20a67323152501969ff1db6a43e467 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 29 Dec 2014 13:53:51 +0100
Subject: [PATCH 1/5] Add stack direction for the AVR32 architecture
The libsigsegv configure step fails to correctly figure out the direction of
stack growth for avr32. This leads to a zero STACK_DIRECTION definition, and
build failures such as the following.
http://autobuild.buildroot.net/results/a3fe938f9376533b4777d79deb7a2ee83ed5ce33
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
m4/stack-direction.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
index 00e0445..39c1a28 100644
--- a/m4/stack-direction.m4
+++ b/m4/stack-direction.m4
@@ -16,7 +16,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
alpha* | \
arc | \
arm* | strongarm* | xscale* | \
- avr | \
+ avr | avr32 | \
c1 | c2 | c32 | c34 | c38 | \
clipper | \
cris | \
--
2.1.0

View File

@ -17,10 +17,6 @@ LIBUSB_INSTALL_STAGING = YES
HOST_LIBUSB_CONF_OPTS = --disable-udev
HOST_LIBUSB_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_avr32),y)
LIBUSB_CONF_OPTS += --disable-timerfd
endif
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
LIBUSB_DEPENDENCIES += udev
else

View File

@ -2,7 +2,7 @@ config BR2_PACKAGE_LUA_EV
bool "lua-ev"
depends on BR2_PACKAGE_HAS_LUAINTERPRETER
select BR2_PACKAGE_LIBEV
depends on !(BR2_avr32 || BR2_bfin) # libev
depends on !BR2_bfin # libev
help
Get access to the libev library from Lua.

View File

@ -5,7 +5,6 @@ config BR2_PACKAGE_LXC
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_LARGEFILE
depends on BR2_USE_MMU # fork()
depends on !BR2_avr32 # no timerfd
# the toolchain doesn't support setns syscall
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
@ -19,7 +18,6 @@ config BR2_PACKAGE_LXC
comment "lxc needs a toolchain w/ IPv6, threads, largefile, headers >= 3.0"
depends on BR2_USE_MMU
depends on !BR2_avr32 # no timerfd
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS \

View File

@ -5,8 +5,8 @@ menuconfig BR2_PACKAGE_MPD
depends on BR2_USE_WCHAR # libglib2, flac
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2
# avr32, sparc & CS powerpc gcc are too old
depends on !(BR2_avr32 || BR2_sparc)
# sparc & CS powerpc gcc are too old
depends on !BR2_sparc
depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009)
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_LIBGLIB2
@ -311,6 +311,6 @@ endif
comment "mpd needs a toolchain w/ C++, threads, wchar"
depends on BR2_USE_MMU
depends on !(BR2_avr32 || BR2_sparc)
depends on !BR2_sparc
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE

View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_MTR
bool "mtr"
# res_mkquery() only available in 0.9.33+
depends on !BR2_UCLIBC_VERSION_0_9_31
depends on !BR2_avr32
help
mtr combines the functionality of the 'traceroute' and 'ping'
programs in a single network diagnostic tool.

View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_MYSQL
depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_THREADS
# Toolchain is not up to the task
depends on !BR2_avr32
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_READLINE
help

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_NETWORK_MANAGER
bool "networkmanager"
depends on !BR2_avr32 # udev
depends on BR2_INET_IPV6
depends on BR2_LARGEFILE # acl
depends on BR2_USE_WCHAR # libglib2 and gnutls
@ -54,7 +53,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_PPPD
endif
comment "NetworkManager needs udev /dev management and a toolchain w/ IPv6, largefile, wchar, threads, headers >= 3.7"
depends on !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || \

View File

@ -3,7 +3,6 @@ config BR2_PACKAGE_OFONO
depends on BR2_USE_WCHAR # gettext, libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
depends on BR2_USE_MMU # dbus, libglib2
depends on !BR2_avr32 # libcap-ng
select BR2_PACKAGE_LIBCAP_NG
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
@ -16,6 +15,5 @@ config BR2_PACKAGE_OFONO
http://ofono.org/
comment "ofono needs a toolchain w/ wchar, threads"
depends on !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

View File

@ -189,7 +189,6 @@ config BR2_PACKAGE_OPENCV_WITH_PNG
config BR2_PACKAGE_OPENCV_WITH_QT
bool "qt backend support"
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_avr32 # qt
depends on BR2_USE_MMU # qt
depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI
select BR2_PACKAGE_QT

View File

@ -11,7 +11,6 @@ if BR2_PACKAGE_OPENOBEX
config BR2_PACKAGE_OPENOBEX_BLUEZ
bool "enable bluez support"
depends on !BR2_avr32
depends on !BR2_STATIC_LIBS # bluez_utils
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
@ -19,7 +18,7 @@ config BR2_PACKAGE_OPENOBEX_BLUEZ
select BR2_PACKAGE_BLUEZ_UTILS
comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
config BR2_PACKAGE_OPENOBEX_LIBUSB

View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_OPENPGM
bool "openpgm"
# The following toolchains lack required compiler intrinsics
depends on !BR2_avr32
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2
depends on BR2_TOOLCHAIN_HAS_THREADS
@ -18,4 +17,3 @@ config BR2_PACKAGE_OPENPGM
comment "openpgm needs a toolchain w/ wchar, threads, IPv6"
depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6 && BR2_USE_WCHAR)
depends on !BR2_avr32

View File

@ -19,11 +19,6 @@ OPROFILE_BINARIES = \
utils/op-check-perfevents libabi/opimport \
pe_counting/ocount
# No perf_events support in kernel for avr32
ifneq ($(BR2_avr32),y)
OPROFILE_BINARIES += pe_profiling/operf
endif
ifeq ($(BR2_i386),y)
OPROFILE_ARCH = i386
endif

View File

@ -106,7 +106,6 @@ config BR2_PACKAGE_PHP_EXT_MYSQL
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # mysql
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
depends on !BR2_avr32 # mysql
select BR2_PACKAGE_MYSQL
help
MySQL support
@ -116,7 +115,6 @@ config BR2_PACKAGE_PHP_EXT_MYSQLI
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # mysql
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
depends on !BR2_avr32 # mysql
select BR2_PACKAGE_MYSQL
select BR2_PACKAGE_PHP_EXT_MYSQL
help
@ -134,7 +132,6 @@ config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # mysql
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
depends on !BR2_avr32 # mysql
select BR2_PACKAGE_MYSQL
help
PDO driver for MySQL
@ -142,7 +139,6 @@ config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
comment "MySQL drivers need a toolchain w/ C++, threads"
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_avr32
config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL
bool "PostgreSQL"

View File

@ -37,7 +37,6 @@ comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++"
config BR2_PACKAGE_PINENTRY_QT4
bool "pinentry-qt4"
depends on !BR2_avr32 # lacks TLS
depends on BR2_USE_MMU # fork
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
@ -47,7 +46,6 @@ config BR2_PACKAGE_PINENTRY_QT4
The pinentry-qt4 tool
comment "pinentry-qt4 needs a toolchain w/ C++, threads"
depends on !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

View File

@ -4,7 +4,7 @@ config BR2_PACKAGE_POCO
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
|| BR2_xtensa || BR2_avr32)
|| BR2_xtensa)
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_PCRE
help
@ -55,7 +55,6 @@ config BR2_PACKAGE_POCO_DATA_SQLITE
config BR2_PACKAGE_POCO_DATA_MYSQL
bool "mysql"
depends on BR2_USE_MMU # mysql
depends on !BR2_avr32 # mysql
select BR2_PACKAGE_POCO_DATA
select BR2_PACKAGE_MYSQL
@ -65,4 +64,4 @@ comment "poco needs a toolchain w/ wchar, threads, C++"
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
|| !BR2_TOOLCHAIN_HAS_THREADS
depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
|| BR2_xtensa || BR2_avr32)
|| BR2_xtensa)

View File

@ -1,54 +0,0 @@
python: do not rely only on LIBRARY_PATH for old compilers
The cross-compilation improvements integrated in Python rely on the
compiler exposing a line starting with LIBRARY_PATH when called with
-E -v. This is used by Python setup.py to find the installation
locations of libraries.
However, this LIBRARY_PATH line is not shown by very old compilers,
such as the gcc 4.2.x compiler used on the AVR32 architecture. This
causes libraries installed in the sysroot, such as libffi, to not be
detected by the setup.py script.
To fix this problem, this patch adds addtional logic to setup.py,
which consists in deriving the library paths from the sysroot
location, if no LIBRARY_PATH field was found.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
@@ -418,6 +418,7 @@
in_incdirs = False
inc_dirs = []
lib_dirs = []
+ compiler_has_library_path = False
try:
if ret >> 8 == 0:
with open(tmpfile) as fp:
@@ -429,6 +430,7 @@
elif line.startswith("End of search list"):
in_incdirs = False
elif is_gcc and line.startswith("LIBRARY_PATH"):
+ compiler_has_library_path = True
for d in line.strip().split("=")[1].split(":"):
d = os.path.normpath(d)
if '/gcc/' not in d:
@@ -440,6 +442,15 @@
finally:
os.unlink(tmpfile)
+ if not compiler_has_library_path:
+ ret = os.system("%s -print-file-name=libc.a | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::' >%s" % (gcc, tmpfile))
+ with open(tmpfile) as fp:
+ line = fp.readline().strip()
+ add_dir_to_list(self.compiler.library_dirs,
+ os.path.join(line, "usr", "lib"))
+ add_dir_to_list(self.compiler.library_dirs,
+ os.path.join(line, "lib"))
+
def detect_modules(self):
# Ensure that /usr/local is always used
if not cross_compiling:

View File

@ -1,54 +0,0 @@
python3: do not rely only on LIBRARY_PATH for old compilers
The cross-compilation improvements integrated in Python rely on the
compiler exposing a line starting with LIBRARY_PATH when called with
-E -v. This is used by Python setup.py to find the installation
locations of libraries.
However, this LIBRARY_PATH line is not shown by very old compilers,
such as the gcc 4.2.x compiler used on the AVR32 architecture. This
causes libraries installed in the sysroot, such as libffi, to not be
detected by the setup.py script.
To fix this problem, this patch adds addtional logic to setup.py,
which consists in deriving the library paths from the sysroot
location, if no LIBRARY_PATH field was found.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
@@ -427,6 +427,7 @@
in_incdirs = False
inc_dirs = []
lib_dirs = []
+ compiler_has_library_path = False
try:
if ret >> 8 == 0:
with open(tmpfile) as fp:
@@ -438,6 +439,7 @@
elif line.startswith("End of search list"):
in_incdirs = False
elif is_gcc and line.startswith("LIBRARY_PATH"):
+ compiler_has_library_path = True
for d in line.strip().split("=")[1].split(":"):
d = os.path.normpath(d)
if '/gcc/' not in d:
@@ -449,6 +451,15 @@
finally:
os.unlink(tmpfile)
+ if not compiler_has_library_path:
+ ret = os.system("%s -print-file-name=libc.a | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::' >%s" % (gcc, tmpfile))
+ with open(tmpfile) as fp:
+ line = fp.readline().strip()
+ add_dir_to_list(self.compiler.library_dirs,
+ os.path.join(line, "usr", "lib"))
+ add_dir_to_list(self.compiler.library_dirs,
+ os.path.join(line, "lib"))
+
def detect_modules(self):
# Ensure that /usr/local is always used, but the local build
# directories (i.e. '.' and 'Include') must be first. See issue

View File

@ -22,7 +22,6 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p
# ------- ----
# arm arm
# armeb armeb
# avr32 not supported
# bfin not supported
# i386 i386
# i486 i386

View File

@ -1,11 +1,9 @@
comment "qt needs a toolchain w/ C++, threads"
depends on !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
menuconfig BR2_PACKAGE_QT
bool "Qt"
depends on !BR2_avr32 # lacks TLS
depends on BR2_USE_MMU # fork
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS

View File

@ -225,8 +225,6 @@ endif
ifeq ($(BR2_arm)$(BR2_armeb),y)
QT_EMB_PLATFORM = arm
else ifeq ($(BR2_avr32),y)
QT_EMB_PLATFORM = avr32
else ifeq ($(BR2_i386),y)
QT_EMB_PLATFORM = x86
else ifeq ($(BR2_x86_64),y)

View File

@ -13,12 +13,10 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
comment "Qt5 needs a toolchain w/ wchar, IPv6, NPTL, C++"
depends on !BR2_PACKAGE_QT
depends on !BR2_avr32
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
menuconfig BR2_PACKAGE_QT5
bool "Qt5"
depends on !BR2_avr32
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR
depends on BR2_INET_IPV6

View File

@ -53,7 +53,6 @@ config BR2_PACKAGE_QT5BASE_MYSQL
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_READLINE
depends on BR2_USE_MMU # mysql
depends on !BR2_avr32 # mysql
help
Build MySQL plugin
If unsure, say n.

View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_QT5CONNECTIVITY
select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5BASE_CONCURRENT
select BR2_PACKAGE_QT5BASE_DBUS
depends on !BR2_avr32 # bluez_utils
depends on !BR2_STATIC_LIBS # bluez_utils
depends on BR2_USE_WCHAR # bluez_utils
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils
@ -18,5 +17,5 @@ config BR2_PACKAGE_QT5CONNECTIVITY
http://qt.io
comment "qt5connectivity needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

View File

@ -3,7 +3,6 @@ config BR2_PACKAGE_RADVD
depends on BR2_USE_MMU # fork()
depends on BR2_INET_IPV6
# uClibc too old, does not define ARPHRD_IEEE802154
depends on !BR2_avr32
select BR2_PACKAGE_FLEX
help
IPv6 Router Advertisement Daemon.
@ -13,4 +12,3 @@ config BR2_PACKAGE_RADVD
comment "radvd needs a toolchain w/ IPv6"
depends on BR2_USE_MMU
depends on !BR2_INET_IPV6
depends on !BR2_avr32

View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_SAMBA
bool "samba"
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
depends on !BR2_avr32 # binary too large, relocations don't fit
depends on !BR2_nios2 # binary too large, relocations don't fit
select BR2_PACKAGE_POPT
help
@ -16,7 +15,6 @@ config BR2_PACKAGE_SAMBA
so choose only the components you need.
comment "samba needs a toolchain w/ threads"
depends on !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS

View File

@ -6,7 +6,6 @@ config BR2_PACKAGE_SAMBA4
depends on BR2_USE_WCHAR # e2fsprogs
depends on BR2_LARGEFILE
depends on BR2_TOOLCHAIN_HAS_THREADS # talloc python threads
depends on !BR2_avr32 # bad toolchain
depends on !BR2_nios2 # binary too large, relocations don't fit
select BR2_PACKAGE_E2FSPROGS
select BR2_PACKAGE_POPT

View File

@ -35,7 +35,6 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE
config BR2_PACKAGE_SCONESERVER_MYSQL
bool "mysql"
depends on BR2_USE_MMU # mysql
depends on !BR2_avr32 # mysql
select BR2_PACKAGE_MYSQL
help
MySQL module for Sconeserver
@ -45,14 +44,13 @@ config BR2_PACKAGE_SCONESERVER_BLUETOOTH
depends on BR2_USE_WCHAR # bluez->libglib2
depends on BR2_USE_MMU # bluez->dbus
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus, bluez->libglib2
depends on !BR2_avr32 # bluez_utils
depends on !BR2_STATIC_LIBS # bluez_utils
select BR2_PACKAGE_BLUEZ_UTILS
help
Bluetooth module for Sconeserver
comment "bluetooth support needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
config BR2_PACKAGE_SCONESERVER_RSS

View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_SNOWBALL_INIT
bool "snowball-init"
# Runtime dependency, needed by snowball startup script
select BR2_PACKAGE_BLUEZ_UTILS
depends on !BR2_avr32
depends on !BR2_STATIC_LIBS # bluez_utils
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
@ -14,5 +13,5 @@ config BR2_PACKAGE_SNOWBALL_INIT
http://www.igloocommunity.org
comment "snowball-init needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

View File

@ -1,6 +1,5 @@
comment "squid needs a toolchain w/ C++, IPv6, headers >= 3.0"
depends on BR2_USE_MMU
depends on !BR2_avr32 # toolchain too old
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6 \
|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0

View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_TRACE_CMD
bool "trace-cmd"
depends on BR2_LARGEFILE
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_avr32 # AVR32 does not have TLS support
depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS # dlopen()
help

View File

@ -6,12 +6,6 @@ config BR2_PACKAGE_TVHEADEND
depends on BR2_LARGEFILE && BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
# tvheadend requires an atomic_add operation. Either you have
# a gcc >= 4.3 toolchain and it uses the gcc intrinsics, or it
# has special code for x86, x86-64, PPC and ARM. So in the
# context of Buildroot, the only really problematic
# architecture is avr32, which uses gcc 4.2.
depends on !BR2_avr32
select BR2_PACKAGE_DTV_SCAN_TABLES
select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG

View File

@ -69,8 +69,8 @@ $(eval $(host-generic-package))
MKIMAGE = $(HOST_DIR)/usr/bin/mkimage
# mkimage supports arm avr32 blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86
# KERNEL_ARCH can be arm64 arc arm avr32 blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
# mkimage supports arm blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86
# KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
# For arm64, arc, xtensa we'll just keep KERNEL_ARCH
# For mips64, we'll just keep mips
# For i386 and x86_64, we need to convert

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_UDISKS
bool "udisks"
depends on !BR2_avr32 # udev
depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2
depends on BR2_USE_MMU # lvm2
@ -36,12 +35,10 @@ config BR2_PACKAGE_UDISKS_LVM2
endif
comment "udisks needs udev /dev management"
depends on !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_PACKAGE_HAS_UDEV
comment "udisks needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
BR2_STATIC_LIBS

View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_USSP_PUSH
bool "ussp-push"
depends on BR2_INET_IPV6
depends on !BR2_avr32
depends on !BR2_STATIC_LIBS # bluez_utils
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
@ -16,5 +15,5 @@ config BR2_PACKAGE_USSP_PUSH
http://www.xmailserver.org/ussp-push.html
comment "ussp-push needs a toolchain w/ wchar, IPv6, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_STATIC_LIBS

View File

@ -93,7 +93,6 @@ config BR2_PACKAGE_UTIL_LINUX_EJECT
config BR2_PACKAGE_UTIL_LINUX_FALLOCATE
bool "fallocate"
depends on !BR2_avr32 # fallocate not implemented
help
Preallocate space to a file
@ -216,7 +215,6 @@ config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
config BR2_PACKAGE_UTIL_LINUX_SETPRIV
bool "setpriv"
depends on !BR2_avr32 # libcap-ng
select BR2_PACKAGE_LIBCAP_NG
help
Run a program with different Linux privilege settings

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_WAYLAND
bool "wayland"
depends on !BR2_avr32 # no epoll_create1, timerfd_create or timerfd_settime
depends on !BR2_STATIC_LIBS # dlfcn.h
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_LIBFFI
@ -13,5 +12,4 @@ config BR2_PACKAGE_WAYLAND
http://wayland.freedesktop.org/
comment "wayland needs a toolchain w/ threads, dynamic library"
depends on !BR2_avr32
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

View File

@ -1,5 +1,4 @@
comment "weston needs udev and a toolchain w/ threads, dynamic library, headers >= 3.0"
depends on !BR2_avr32
depends on BR2_ARCH_HAS_ATOMICS
depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_STATIC_LIBS
@ -14,7 +13,6 @@ config BR2_PACKAGE_WESTON
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_MTDEV
depends on BR2_PACKAGE_HAS_UDEV
depends on !BR2_avr32 # wayland
depends on !BR2_STATIC_LIBS # wayland
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0

View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_WPA_SUPPLICANT
bool "wpa_supplicant"
depends on BR2_USE_MMU # fork()
depends on !BR2_avr32 # no epoll_create1
help
WPA supplicant for secure wireless networks

View File

@ -49,16 +49,12 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XUTIL_UTIL_MACROS
select BR2_PACKAGE_XKEYBOARD_CONFIG
depends on !BR2_avr32
depends on BR2_USE_MMU # fork()
help
X.Org X server
http://xorg.freedesktop.org
comment "xorg-xserver is BROKEN on AVR32"
depends on BR2_avr32 && BR2_USE_MMU
if BR2_PACKAGE_XSERVER_XORG_SERVER
choice

View File

@ -31,7 +31,6 @@ if BR2_PACKAGE_ZEROMQ
config BR2_PACKAGE_ZEROMQ_PGM
bool "PGM/EPGM support"
depends on !BR2_avr32 # openpgm
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1 # openpgm
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 # openpgm
select BR2_PACKAGE_OPENPGM

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_ZMQPP
bool "zmqpp"
depends on !BR2_avr32 # compiler needs c++0x support
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 # c++0x support
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009 # c++0x support
depends on BR2_INSTALL_LIBSTDCPP
@ -18,7 +17,6 @@ config BR2_PACKAGE_ZMQPP
http://github.com/benjamg/zmqpp
comment "zmqpp needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
depends on !BR2_avr32
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)