diff options
169 files changed, 1077 insertions, 190 deletions
@@ -1,3 +1,58 @@ +2013.11, Released November 30th, 2013: + + Minor fixes. + + Updated/fixed packages: apr, binutils, dbus-python, dropwatch, + ecryptfs-utils, eglibc, gdb, gpsd, grantlee, hostapd, + iptables, qlibiscsi, libnspr, libnss, libpfm4, libtool, + lua-ev, lvm2, mplayer, qt, qt5, quagga, ruby, tinymembench, + tvheadend, util-linux, wpa_supplicant + + Issues resolved (http://bugs.uclibc.org): + + #1279: Buildroot compiled Busybox and Coreutils LFS issues + #2995: -fstack-protector-all causes ssh to SIGSEGV + #5570: Cannot compile software on the target machine + #6428: util-linux libmount segfaults with patch from buildroot + #6500: php fails to build for armel + #6554: gdb needs to dependents on host texinfo + #6692: GNU nano fails to compile for x86_64 + #6704: wpa_supplicant: fix wrong path to executable file in D-Bus + +2013.11-rc3, Released November 26th, 2013 + + Fixes all over the tree. + + Architecture: Mark MIPS I, II, III and IV as deprecated. + + Updated/fixed packages: beecrypt, dbus, e2fsprogs, libcap-ng, + libglib2, libroxml, libsigsegv, libvncserver, lxc, mdadm, + mongoose, nut, ola, omniorb, openssl, pcre, php, poco, + protobuf-c, pv, qt5base, ruby, schifra, squid, sunxi-mail, + swig, ti-gfx, tinymembench, uclibc, udisks, vim + +2013.11-rc2, Released November 18th, 2013 + + Fixes all over the tree. + + Defconfigs: qemu_arm_versatile, qemu_arm_nuri, sheevaplug: + Adjust kernel versions. + + Toolchain: avr32: fix for modern kernel headers + + Bootloader: Barebox updated to 2013.10.1 + + Updated/fixed packages: dhcp, e2fsprogs, gst1-plugins-bad, + libcurl, libvncserver, nano, pc, qt5base, squashfs, ttcp, + wayland, wvstreams + + Issues resolved (http://bugs.uclibc.org): + + #3601: DHCPD S80dhcp-server startup script issues + #6320: Fix kernel compile issue if BR2_LINUX_KERNEL_CUSTOM_GIT_VERS.. + #6416: Xenomai package, patch alternative + #6590: directfb-examples build failed whit linaro toolchain + 2013.11-rc1, Released November 12th, 2013 Architectures: Nios-II support, MIPS arch handling fixes diff --git a/Config.in.legacy b/Config.in.legacy index 587afe1582..09935f183a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -101,6 +101,18 @@ endif ############################################################################### comment "Legacy options removed in 2013.11" +config BR2_PACKAGE_LVM2_DMSETUP_ONLY + bool "lvm2's 'dmsetup only' option removed" + select BR2_LEGACY + help + The BR2_PACKAGE_LVM2_DMSETUP_ONLY was a negative option, which + led to problems with other packages that need the full lvm2 + suite. Therefore, the option has been replaced with the positive + BR2_PACKAGE_LVM2_STANDARD_INSTALL option. + +# Note: BR2_PACKAGE_LVM2_DMSETUP_ONLY is still referenced in package/lvm2/Config.in +# in order to automatically propagate old configs + config BR2_PACKAGE_QT_JAVASCRIPTCORE bool "qt javascriptcore option removed" select BR2_LEGACY diff --git a/arch/Config.in.mips b/arch/Config.in.mips index d70fd6366f..412120076b 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -1,8 +1,7 @@ choice prompt "Target Architecture Variant" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - default BR2_mips_3 if BR2_mips - default BR2_mips_1 if BR2_mipsel + default BR2_mips_32 if BR2_mips || BR2_mipsel default BR2_mips_64 if BR2_mips64 || BR2_mips64el help Specific CPU variant to use @@ -12,14 +11,16 @@ choice config BR2_mips_1 bool "mips I (generic)" - depends on !BR2_ARCH_IS_64 + depends on !BR2_ARCH_IS_64 && BR2_DEPRECATED config BR2_mips_2 bool "mips II" - depends on !BR2_ARCH_IS_64 + depends on !BR2_ARCH_IS_64 && BR2_DEPRECATED config BR2_mips_3 bool "mips III" + depends on BR2_DEPRECATED config BR2_mips_4 bool "mips IV" + depends on BR2_DEPRECATED config BR2_mips_32 bool "mips 32" depends on !BR2_ARCH_IS_64 diff --git a/board/qemu/arm-versatile/linux-3.12.config b/board/qemu/arm-versatile/linux-3.11.config index da73575b5c..da73575b5c 100644 --- a/board/qemu/arm-versatile/linux-3.12.config +++ b/board/qemu/arm-versatile/linux-3.11.config diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig index 965f55de27..f6fc12e47a 100644 --- a/configs/qemu_arm_nuri_defconfig +++ b/configs/qemu_arm_nuri_defconfig @@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.18" +BR2_DEFAULT_KERNEL_VERSION="3.10.20" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.20" BR2_LINUX_KERNEL_DEFCONFIG="exynos4" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 88df6c821d..c65b9c1242 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.12 headers to avoid breaking with newer kernels +# Lock to 3.11 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.11.9" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.9" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.12.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.11.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 324a8110fa..6b393ef009 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 0a621b1be0..ea75624bc2 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.12.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 51d58c6cf7..82c56c03dc 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.12.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index fd8223380d..c40abc17de 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.12.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig index 6e2c60133b..8a6ed26918 100644 --- a/configs/qemu_mips_malta_defconfig +++ b/configs/qemu_mips_malta_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.12.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig index ff640a10c9..9a4164db77 100644 --- a/configs/qemu_mipsel_malta_defconfig +++ b/configs/qemu_mipsel_malta_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.12.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index bd0bc0307b..f284b9be6f 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.12.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 687b53707b..bf94c9fd26 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig index a0dc674d7a..2d57338ce9 100644 --- a/configs/qemu_ppc_virtex_ml507_defconfig +++ b/configs/qemu_ppc_virtex_ml507_defconfig @@ -8,7 +8,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Use soft float BR2_SOFT_FLOAT=y @@ -16,7 +16,7 @@ BR2_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 67bffbdef6..0f11fa3cc1 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -8,11 +8,11 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_DEFCONFIG="sparc32" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 816cef1a9d..0e33da31fe 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -11,11 +11,11 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.12.config" diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index ccccfa2981..05404ba4ad 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -12,11 +12,11 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.12 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12" +BR2_DEFAULT_KERNEL_VERSION="3.12.1" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.12.config" diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 70572d7999..4161766f25 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -13,17 +13,19 @@ BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y # Lock down headers to avoid breaking with new defaults BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.5.4" +BR2_DEFAULT_KERNEL_VERSION="3.11.8" # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="sheevaplug" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10" BR2_TARGET_UBOOT_FORMAT_KWB=y # BR2_TARGET_UBOOT_NETWORK is not set # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.8" BR2_LINUX_KERNEL_DEFCONFIG="kirkwood" BR2_LINUX_KERNEL_UIMAGE=y diff --git a/docs/download.html b/docs/download.html index dfba889298..b9a9fcf1e7 100644 --- a/docs/download.html +++ b/docs/download.html @@ -6,23 +6,23 @@ <p> -The latest stable release is <b>2013.08.1</b>, which can be downloaded +The latest stable release is <b>2013.11</b>, which can be downloaded here:<p> -<a href="/downloads/buildroot-2013.08.1.tar.gz">buildroot-2013.08.1.tar.gz</a> +<a href="/downloads/buildroot-2013.11.tar.gz">buildroot-2013.11.tar.gz</a> or -<a href="/downloads/buildroot-2013.08.1.tar.bz2">buildroot-2013.08.1.tar.bz2</a>. +<a href="/downloads/buildroot-2013.11.tar.bz2">buildroot-2013.11.tar.bz2</a>. <p> - -The latest release candidate is <b>2013.11-rc1</b>, which can be +<!-- +The latest release candidate is <b>2013.11-rc3</b>, which can be downloaded here:<p> -<a href="/downloads/buildroot-2013.11-rc1tar.gz">buildroot-2013.11-rc1.tar.gz</a> +<a href="/downloads/buildroot-2013.11-rc3.tar.gz">buildroot-2013.11-rc3.tar.gz</a> or -<a href="/downloads/buildroot-2013.11-rc3.tar.bz2">buildroot-2013.11-rc1.tar.bz2</a>. +<a href="/downloads/buildroot-2013.11-rc3.tar.bz2">buildroot-2013.11-rc3.tar.bz2</a>. <p> - +--> This and earlier releases can always be downloaded from <a href="/downloads/">http://buildroot.net/downloads/</a>. diff --git a/docs/header.html b/docs/header.html index 9c615f41c9..b987d85e95 100644 --- a/docs/header.html +++ b/docs/header.html @@ -56,6 +56,7 @@ <br><a href="/lists.html">Mailing Lists</a> <br><a href="http://autobuild.buildroot.org">Autobuilder</a> <br><a href="http://patchwork.buildroot.org">Patchwork</a> + <br><a href="/sponsors.html">Sponsors</a> </td> diff --git a/docs/news.html b/docs/news.html index 91ed85da8e..efa8fd1528 100644 --- a/docs/news.html +++ b/docs/news.html @@ -5,12 +5,79 @@ <p> <ul> + <li><b>30 November 2013 -- 2013.11 released</b> + + <p>The stable 2013.11 release is out - Thanks to everyone + contributing and testing the release candidates. See the + <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11">CHANGES</a> + file for more details + and go to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2013.11.tar.bz2">2013.11 release</a>.</p> + + <li><b>30 November 2013 -- Slides from Embedded Linux Conference Europe</b> + + <p>The slides from the Buildroot presentation at the recent + <a href="http://events.linuxfoundation.org/events/embedded-linux-conference-europe">Embedded Linux Conference Europe 2013</a> + are now + <a href="http://elinux.org/images/2/23/Buildroot-whats-new-elce2013.pdf">available</a>.</p> + + <li><b>18 November 2013 -- 2013.11-rc3 released</b> + + <p>Another week, another release candidate with more fixes. See the <a + href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11-rc3">CHANGES</a> + file for details.</p> + + <p>Head to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2013.11-rc3.tar.bz2">2013.11-rc3 + release candidate</a>, and report any problems found to the <a + href="lists.html">mailing list</a> or <a + href="https://bugs.uclibc.org">bug tracker</a>.</p> + + <li><b>18 November 2013 -- 2013.11-rc2 released</b> + + <p>Another week, another release candidate with more cleanups and + build fixes. See the <a + href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11-rc2">CHANGES</a> + file for details.</p> + + <p>Head to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2013.11-rc2.tar.bz2">2013.11-rc2 + release candidate</a>, and report any problems found to the <a + href="lists.html">mailing list</a> or <a + href="https://bugs.uclibc.org">bug tracker</a>.</p> + + <li><b>13 November 2013 -- Announcement of the next Buildroot Developer Days</b> + + <p>The next <i>Buildroot Developer Days</i> meeting will take + place on Monday 3rd and Tuesday 4th February 2014 in Brussels, + Belgium - Just after + <a href="http://www.fosdem.org">FOSDEM</a> (February + 1st/2nd). This two days meeting is mainly open to Buildroot + developers and contributors, or Buildroot users having a prior + experience with the tool. It will allow developers to work on + Buildroot and discuss current issues, the future directions, and + more.</p> + + <p>In addition to the Buildroot event, we encourage embedded Linux + developers to propose talks for the Embedded and Mobile Developer + Room at FOSDEM. See + the <a href="https://lists.fosdem.org/pipermail/fosdem/2013-October/001870.html">CFP</a>.</p> + + <p>We would like to thank our + sponsor <a href="http://www.google.com">Google</a> for sponsoring + the event by providing all the needed logistics.</p> + + <p>For more details, see the + <a href="http://www.elinux.org/Buildroot:DeveloperDaysFOSDEM2014">wiki + page</a> dedicated to the meeting.</p> + <li><b>12 November 2013 -- 2013.11-rc1 released</b> <p>We have a new release candidate! Lots of changes all over the tree, see the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11_rc1">CHANGES</a> - file for details.</p> + file for details, and read the + <a href="http://lists.busybox.net/pipermail/buildroot/2013-November/082514.html">announcement</a>.</p> <p>Head to the <a href="/downloads/">downloads page</a> to pick up the <a href="/downloads/buildroot-2013.11-rc1.tar.bz2">2013.11-rc1 diff --git a/docs/sponsors.html b/docs/sponsors.html new file mode 100644 index 0000000000..a048b1db01 --- /dev/null +++ b/docs/sponsors.html @@ -0,0 +1,41 @@ +<!--#include file="header.html" --> + +<h3>Sponsors</h3> + +<p>Throughout its history, the Buildroot project has been sponsored by +various companies, that we would like to thank below:</p> + +<ul> + + <li><a href="http://www.google.com">Google</a>, for providing all + the logistics for the FOSDEM 2013 and FOSDEM 2014 Developer Days in + Brussels, Belgium.</li> + + <li><a href="http://www.imgtec.com/">Imagination Technologies</a>, + for sponsoring the meeting room and dinner of the ELCE 2013 + Developer Days in Edinburgh, UK.</li> + + <li><a href="http://circuitco.com/">CircuitCo</a>, for sponsoring + several development boards for the Google Summer of Code 2013 + project on Buildroot.</li> + + <li><a href="http://boundarydevices.com/">BoundaryDevices</a>, for + sponsoring an i.MX6 development board for the Google Summer of Code + 2013 project on Buildroot.</li> + + <li><a href="http://www.fluendo.com/">Fluendo</a>, for sponsoring + the meeting room for the ELCE 2012 Developer Days in Barcelona + Spain.</li> + + <li><a href="http://www.synopsys.com">Synopsys</a>, for sponsoring + the dinner for the ELCE 2012 Developer Days in Barcelona, + Spain.</li> + + <li><a href="http://www.calao-systems.com/">Calao Systems</a> + and <a href="http://free-electrons.com/">Free Electrons</a> for + providing a meeting room and offering lunch for the ELCE 2009 + Developer Days in Grenoble, France.</li> + +</ul> + +<!--#include file="footer.html" --> diff --git a/linux/Config.in b/linux/Config.in index 9b2025cc56..3061809606 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -21,7 +21,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "3.12" + bool "3.12.1" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -87,7 +87,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "3.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "3.12.1" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in index 895dbb86d5..3d4ec2303d 100644 --- a/package/apr-util/Config.in +++ b/package/apr-util/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_APR_UTIL select BR2_PACKAGE_ZLIB # apr really needs shared library support depends on !BR2_PREFER_STATIC_LIB + depends on BR2_USE_MMU # apr help The utility library for the apache runtime project diff --git a/package/apr/Config.in b/package/apr/Config.in index ed319ed058..e06d2546a8 100644 --- a/package/apr/Config.in +++ b/package/apr/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_APR bool "apr" # apr really needs shared library support depends on !BR2_PREFER_STATIC_LIB + depends on BR2_USE_MMU # fork() in apr_proc_fork() help The mission of the Apache Portable Runtime (APR) project is to create and maintain software libraries that provide a predictable and diff --git a/package/apr/apr.mk b/package/apr/apr.mk index 4da42c5b9f..1a4c0e261b 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -19,6 +19,11 @@ APR_CONF_ENV = \ apr_cv_mutex_recursive=yes APR_CONFIG_SCRIPTS = apr-1-config +# Doesn't even try to guess when cross compiling +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +APR_CONF_ENV += apr_cv_pthreads_lib="-lpthread" +endif + define APR_CLEANUP_UNNEEDED_FILES $(RM) -rf $(TARGET_DIR)/usr/build-1/ endef diff --git a/package/atk/Config.in b/package/atk/Config.in index e2707e5fea..1120a94dd0 100644 --- a/package/atk/Config.in +++ b/package/atk/Config.in @@ -3,8 +3,10 @@ config BR2_PACKAGE_ATK select BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 help The ATK accessibility toolkit, needed to build GTK+-2.x. comment "atk needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch b/package/beecrypt/beecrypt-0001-cppglue.cxx-cplusplus-only.patch index 298e3eba93..298e3eba93 100644 --- a/package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch +++ b/package/beecrypt/beecrypt-0001-cppglue.cxx-cplusplus-only.patch diff --git a/package/beecrypt/beecrypt-icu-check-cross-compile.patch b/package/beecrypt/beecrypt-0002-icu-check-cross-compile.patch index cc02116506..cc02116506 100644 --- a/package/beecrypt/beecrypt-icu-check-cross-compile.patch +++ b/package/beecrypt/beecrypt-0002-icu-check-cross-compile.patch diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk index 5805bda5ae..223b44fb33 100644 --- a/package/beecrypt/beecrypt.mk +++ b/package/beecrypt/beecrypt.mk @@ -19,7 +19,8 @@ BEECRYPT_CONF_ENV = \ BEECRYPT_CONF_OPT = \ --without-java \ - --without-python + --without-python \ + --disable-openmp ifeq ($(BR2_PACKAGE_ICU),y) # C++ support needs icu diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index f1723b2148..b3ccee2bcb 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -39,7 +39,6 @@ BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB BINUTILS_CONF_OPT = --disable-multilib --disable-werror \ --host=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \ - --enable-shared \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) # Install binutils after busybox to prefer full-blown utilities diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in index b6f65b4258..e08e9be2db 100644 --- a/package/bluez_utils/Config.in +++ b/package/bluez_utils/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_BLUEZ_UTILS depends on !BR2_avr32 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 - depends on BR2_USE_MMU # dbus + depends on BR2_USE_MMU # dbus, libglib2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 help diff --git a/package/bustle/Config.in b/package/bustle/Config.in index 7be3222efa..f213da503e 100644 --- a/package/bustle/Config.in +++ b/package/bustle/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_BUSTLE select BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_DBUS # runtime help Bustle is a better dbus-monitor! It records and draws @@ -20,5 +21,6 @@ config BR2_PACKAGE_BUSTLE http://www.willthompson.co.uk/bustle/ comment "bustle needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on BR2_PACKAGE_DBUS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/connman/Config.in b/package/connman/Config.in index 0c381af773..4a4090fe76 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_CONNMAN depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 - depends on BR2_USE_MMU # dbus + depends on BR2_USE_MMU # dbus, libglib2 help The Connection Manager (ConnMan) project provides a daemon for managing internet connections within embedded devices running diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in index 90763d76fd..ec40f3da0c 100644 --- a/package/curlftpfs/Config.in +++ b/package/curlftpfs/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_CURLFTPFS depends on BR2_LARGEFILE depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2 - depends on BR2_USE_MMU # libfuse + depends on BR2_USE_MMU # libfuse, glib2 depends on !BR2_PREFER_STATIC_LIB # libfuse help CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in index 4d13f774de..7fe0ac6606 100644 --- a/package/dbus-glib/Config.in +++ b/package/dbus-glib/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DBUS_GLIB depends on BR2_PACKAGE_DBUS depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 help GLib bindings for D-Bus. @@ -10,5 +11,6 @@ config BR2_PACKAGE_DBUS_GLIB http://www.freedesktop.org/software/dbus comment "dbus-glib needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on BR2_PACKAGE_DBUS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in index f7b6d943cf..a38d27794a 100644 --- a/package/dbus-python/Config.in +++ b/package/dbus-python/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_DBUS_PYTHON depends on BR2_PACKAGE_DBUS depends on BR2_PACKAGE_PYTHON select BR2_PACKAGE_DBUS_GLIB + # pyexpat: runtime dependency only + select BR2_PACKAGE_PYTHON_PYEXPAT help Python bindings for D-Bus diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index e2412478b5..560f63e8dd 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -75,11 +75,15 @@ define DBUS_INSTALL_TARGET_FIXUP mkdir -p $(TARGET_DIR)/var/lib rm -rf $(TARGET_DIR)/var/lib/dbus ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus - $(INSTALL) -m 0755 -D package/dbus/S30dbus $(TARGET_DIR)/etc/init.d/S30dbus endef DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP +define DBUS_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/dbus/S30dbus \ + $(TARGET_DIR)/etc/init.d/S30dbus +endef + HOST_DBUS_DEPENDENCIES = host-pkgconf host-expat HOST_DBUS_CONF_OPT = \ --with-dbus-user=dbus \ diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in index e341485b16..7944edefc9 100644 --- a/package/dhcp/Config.in +++ b/package/dhcp/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_DHCP - bool "isc dhcp" + bool "dhcp (ISC)" # fork() depends on BR2_USE_MMU help diff --git a/package/dhcp/S80dhcp-relay b/package/dhcp/S80dhcp-relay index c870ea7f5d..2a632ef950 100755 --- a/package/dhcp/S80dhcp-relay +++ b/package/dhcp/S80dhcp-relay @@ -3,7 +3,6 @@ # $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $ # - # What servers should the DHCP relay forward requests to? # e.g: SERVERS="192.168.0.1" SERVERS="" @@ -14,31 +13,29 @@ INTERFACES="" # Additional options that are passed to the DHCP relay daemon? OPTIONS="" - - - -# It is not safe to start if we don't have a default configuration... -echo "/etc/init.d/dhcp-relay not yet configured! - Aborting..." -exit 1; - - +# Sanity checks +test -f /usr/sbin/dhcrelay || exit 0 +test -n "$INTERFACES" || exit 0 +test -n "$SERVERS" || exit 0 # Build command line for interfaces (will be passed to dhrelay below.) IFCMD="" -if test "$INTERFACES" != ""; then - for I in $INTERFACES; do - IFCMD=${IFCMD}"-i "${I}" " - done -fi +for I in $INTERFACES; do + IFCMD=${IFCMD}"-i "${I}" " +done DHCRELAYPID=/var/run/dhcrelay.pid case "$1" in start) + echo -n "Starting DHCP relay: " start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS + [ $? == 0 ] && echo "OK" || echo "FAIL" ;; stop) + echo -n "Stopping DHCP relay: " start-stop-daemon -K -x /usr/sbin/dhcrelay + [ $? == 0 ] && echo "OK" || echo "FAIL" ;; restart | force-reload) $0 stop @@ -47,7 +44,7 @@ case "$1" in ;; *) echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}" - exit 1 + exit 1 esac exit 0 diff --git a/package/dhcp/S80dhcp-server b/package/dhcp/S80dhcp-server index 7c7f893a14..98bd3cc67e 100755 --- a/package/dhcp/S80dhcp-server +++ b/package/dhcp/S80dhcp-server @@ -3,34 +3,27 @@ # $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $ # - - # On what interfaces should the DHCP server (dhcpd) serve DHCP requests? # Separate multiple interfaces with spaces, e.g. "eth0 eth1". INTERFACES="" - -# It is not safe to start if we don't have a default configuration... -echo "/etc/init.d/dhcp-server not yet configured! - Aborting..." -exit 1; - - - +# Sanity checks test -f /usr/sbin/dhcpd || exit 0 - +test -f /etc/dhcpd.conf || exit 0 +test -n "$INTERFACES" || exit 0 case "$1" in start) echo -n "Starting DHCP server: " test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/ - test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases + test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES - echo "." + [ $? == 0 ] && echo "OK" || echo "FAIL" ;; stop) echo -n "Stopping DHCP server: dhcpd3" start-stop-daemon -K -x /usr/sbin/dhcpd - echo "." + [ $? == 0 ] && echo "OK" || echo "FAIL" ;; restart | force-reload) $0 stop @@ -42,7 +35,7 @@ case "$1" in ;; *) echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}" - exit 1 + exit 1 esac exit 0 diff --git a/package/docker/Config.in b/package/docker/Config.in index b9feec028a..12f8432bc1 100644 --- a/package/docker/Config.in +++ b/package/docker/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER depends on BR2_PACKAGE_XORG7 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_XLIB_LIBX11 help @@ -11,5 +12,6 @@ config BR2_PACKAGE_DOCKER http://icculus.org/openbox/2/docker comment "docker needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on BR2_PACKAGE_XORG7 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk index 6bbcb234c8..082b33144f 100644 --- a/package/dropwatch/dropwatch.mk +++ b/package/dropwatch/dropwatch.mk @@ -16,7 +16,8 @@ DROPWATCH_LICENSE_FILES = COPYING # # 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 -liberty -lreadline -lnl-3 -lnl-genl-3 \ + -lpthread -lncurses -lm ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) DROPWATCH_LDFLAGS += -lintl diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index 16d367106c..1d1e174f45 100644 --- a/package/e2fsprogs/Config.in +++ b/package/e2fsprogs/Config.in @@ -49,6 +49,7 @@ config BR2_PACKAGE_E2FSPROGS_E2UNDO config BR2_PACKAGE_E2FSPROGS_E4DEFRAG bool "e4defrag" + depends on !BR2_avr32 # fallocate not implemented config BR2_PACKAGE_E2FSPROGS_FILEFRAG bool "filefrag" diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 0670c747cd..cdca9062ab 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -11,7 +11,7 @@ E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h l E2FSPROGS_CONF_OPT = \ --disable-tls \ - --enable-elf-shlibs \ + $(if $(BR2_PREFER_STATIC_LIB),,--enable-elf-shlibs) \ $(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \ $(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \ $(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \ diff --git a/package/ecryptfs-utils/Config.in b/package/ecryptfs-utils/Config.in index 480aeddc9b..62cf6c856a 100644 --- a/package/ecryptfs-utils/Config.in +++ b/package/ecryptfs-utils/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS depends on !BR2_avr32 && !BR2_microblaze # keyutils depends on BR2_LARGEFILE # libnss depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr - depends on !BR2_arc # libnss -> libnspr + depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr help eCryptfs is a POSIX-compliant enterprise cryptographic filesystem for Linux. It is stacked on top of any other @@ -21,3 +21,9 @@ config BR2_PACKAGE_ECRYPTFS_UTILS for another method. http://ecryptfs.org + +comment "ecryptfs-utils needs a toolchain w/ largefile, threads" + depends on !BR2_avr32 && !BR2_microblaze + depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT + depends on BR2_USE_MMU + depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/enchant/Config.in b/package/enchant/Config.in index 102fb02b82..86b2fade8f 100644 --- a/package/enchant/Config.in +++ b/package/enchant/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_ENCHANT depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 help Enchant is a spell-checking library that provides a consistent @@ -11,5 +12,6 @@ config BR2_PACKAGE_ENCHANT http://www.abisource.com/projects/enchant/ comment "enchant needs a toolchain w/ C++, threads, wchar" + depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gamin/Config.in b/package/gamin/Config.in index f5fb914363..c191be06f6 100644 --- a/package/gamin/Config.in +++ b/package/gamin/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GAMIN bool "gamin" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 help the File Alteration Monitor @@ -9,4 +10,5 @@ config BR2_PACKAGE_GAMIN http://www.gnome.org/~veillard/gamin/sources comment "gamin needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 9cf90e32bb..700cf724d8 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -57,6 +57,7 @@ HOST_GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH endif GDB_CONF_ENV = \ + ac_cv_prog_MAKEINFO=missing \ ac_cv_type_uintptr_t=yes \ gt_cv_func_gettext_libintl=yes \ ac_cv_func_dcgettext=yes \ diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in index 9a14c3ac1a..44942ac4f6 100644 --- a/package/gdk-pixbuf/Config.in +++ b/package/gdk-pixbuf/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GDK_PIXBUF bool "gdk-pixbuf" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -11,4 +12,5 @@ config BR2_PACKAGE_GDK_PIXBUF http://www.gtk.org/ comment "gdk-pixbuf needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in index 4c739849df..01d8552f80 100644 --- a/package/glib-networking/Config.in +++ b/package/glib-networking/Config.in @@ -2,10 +2,12 @@ config BR2_PACKAGE_GLIB_NETWORKING bool "glib-networking" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT help Network-related GIO modules for glib. comment "glib-networking needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch b/package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch new file mode 100644 index 0000000000..c9bf107482 --- /dev/null +++ b/package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch @@ -0,0 +1,35 @@ +Fix for CVE-2013-4788 from http://hmarco.org/bugs/CVE-2013-4788.html + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -rupN glibc-2.17/csu/libc-start.c glibc-2.17-mangle-fix/csu/libc-start.c +--- glibc-2.17/libc/csu/libc-start.c 2012-12-25 04:02:13.000000000 +0100 ++++ glibc-2.17-mangle-fix/libc/csu/libc-start.c 2013-07-10 00:13:48.000000000 +0200 +@@ -38,6 +38,12 @@ extern void __pthread_initialize_minimal + in thread local area. */ + uintptr_t __stack_chk_guard attribute_relro; + # endif ++ ++# ifndef THREAD_SET_POINTER_GUARD ++uintptr_t __pointer_chk_guard_local ++ attribute_relro attribute_hidden __attribute__ ((nocommon)); ++# endif ++ + #endif + + #ifdef HAVE_PTR_NTHREADS +@@ -184,6 +190,14 @@ LIBC_START_MAIN (int (*main) (int, char + # else + __stack_chk_guard = stack_chk_guard; + # endif ++ uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random, ++ stack_chk_guard); ++# ifdef THREAD_SET_POINTER_GUARD ++ THREAD_SET_POINTER_GUARD (pointer_chk_guard); ++# else ++ __pointer_chk_guard_local = pointer_chk_guard; ++# endif ++ + #endif + + /* Register the destructor of the dynamic linker if there is any. */ diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in index bdfff16650..6ac4be5432 100644 --- a/package/glibmm/Config.in +++ b/package/glibmm/Config.in @@ -5,11 +5,13 @@ config BR2_PACKAGE_GLIBMM depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 help The GLibmm package is a set of C++ bindings for GLib. http://www.gtkmm.org/ comment "glibmm needs a toolchain w/ C++, wchar, threads" + depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in index 0d5f0dc816..43bc642d74 100644 --- a/package/gmpc/Config.in +++ b/package/gmpc/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GMPC depends on BR2_PACKAGE_LIBGTK2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE @@ -21,5 +22,6 @@ config BR2_PACKAGE_GMPC http://gmpcwiki.sarine.nl/index.php?title=GMPC comment "gmpc needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on BR2_PACKAGE_XORG7 && BR2_PACKAGE_LIBGTK2 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gob2/Config.in b/package/gob2/Config.in index 8e930fa549..092d51bcbf 100644 --- a/package/gob2/Config.in +++ b/package/gob2/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_GOB2 bool "gob2" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - # m4 uses fork(), so does bison then - depends on BR2_USE_MMU + depends on BR2_USE_MMU # bison, glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_FLEX select BR2_PACKAGE_BISON diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 5b007d7df3..2fd97d00d4 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -34,6 +34,7 @@ config BR2_PACKAGE_GPSD_OLDSTYLE config BR2_PACKAGE_GPSD_PROFILING bool "profiling support" depends on BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_aarch64 comment "profiling support not available with uClibc-based toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in index 84afad207a..09ec70c018 100644 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_GRANTLEE bool "grantlee" + depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT select BR2_PACKAGE_QT_STL select BR2_PACKAGE_QT_SCRIPT select BR2_PACKAGE_QT_GUI_MODULE diff --git a/package/gstreamer/gstreamer/Config.in b/package/gstreamer/gstreamer/Config.in index bd6022e9a2..9a83a9688e 100644 --- a/package/gstreamer/gstreamer/Config.in +++ b/package/gstreamer/gstreamer/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GSTREAMER bool "gstreamer" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 help GStreamer is an open source multimedia framework. @@ -29,4 +30,5 @@ config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY the launch-time for a GStreamer application. comment "gstreamer needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d6f087d457..d028245124 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -358,6 +358,7 @@ 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_TOOLCHAIN_HAS_THREADS # wayland select BR2_PACKAGE_WAYLAND help diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-fix-dfb-example.patch b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-fix-dfb-example.patch new file mode 100644 index 0000000000..b1f06ff38a --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-fix-dfb-example.patch @@ -0,0 +1,33 @@ +[PATCH] work around dfb-example build issue + +directfb.h defines a number of macros which conflicts with gst/gst.h: + +In file included from ../sysroot/usr/include/gstreamer-1.0/gst/gst.h:50:0, + from dfb-example.c:4: +../sysroot/usr/include/gstreamer-1.0/gst/gstinfo.h:295:69: error: expected ‘)’ before ‘__attribute__’ +../sysroot/usr/include/gstreamer-1.0/gst/gstinfo.h:295:69: error: expected ‘,’ or ‘;’ before ‘)’ token + +As mentioned in the upstream bug report: + +https://bugzilla.gnome.org/show_bug.cgi?id=685609 + +A workaround is to simply swap the include order around. + +Signed-off-by: Peter Korsgaard <peter@korsgaard.com> +--- + ext/directfb/dfb-example.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gst1-plugins-bad-1.2.1/ext/directfb/dfb-example.c +=================================================================== +--- gst1-plugins-bad-1.2.1.orig/ext/directfb/dfb-example.c ++++ gst1-plugins-bad-1.2.1/ext/directfb/dfb-example.c +@@ -1,7 +1,7 @@ + +-#include <directfb.h> + #include <stdio.h> + #include <gst/gst.h> ++#include <directfb.h> + + static IDirectFB *dfb = NULL; + static IDirectFBSurface *primary = NULL; diff --git a/package/gstreamer1/gstreamer1/Config.in b/package/gstreamer1/gstreamer1/Config.in index ad7079cc11..8c8f165357 100644 --- a/package/gstreamer1/gstreamer1/Config.in +++ b/package/gstreamer1/gstreamer1/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GSTREAMER1 bool "gstreamer1" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 help GStreamer is an open source multimedia framework. This 1.x version of @@ -50,4 +51,5 @@ config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS endif comment "gstreamer1 needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in index 71e8497199..f3a04f5f3d 100644 --- a/package/gvfs/Config.in +++ b/package/gvfs/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_GVFS bool "gvfs" depends on BR2_LARGEFILE depends on BR2_USE_WCHAR # glib2 - depends on BR2_USE_MMU # dbus + depends on BR2_USE_MMU # dbus, glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_DBUS diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 4d31df54cf..0fbd8bc998 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -10,13 +10,14 @@ HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_DEPENDENCIES = libnl HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ -HOSTAPD_LDFLAGS = $(TARGET_LDFLAGS) HOSTAPD_LICENSE = GPLv2/BSD-3c HOSTAPD_LICENSE_FILES = README -# libnl needs -lm (for rint) if linking statically +# libnl-3 needs -lm (for rint) and -lpthread if linking statically +# And library order matters hence stick -lnl-3 first since it's appended +# in the hostapd Makefiles as in LIBS+=-lnl-3 ... thus failing ifeq ($(BR2_PREFER_STATIC_LIB),y) -HOSTAPD_LDFLAGS += -lm +HOSTAPD_LIBS += -lnl-3 -lm -lpthread endif define HOSTAPD_LIBNL_CONFIG @@ -93,7 +94,7 @@ endef define HOSTAPD_BUILD_CMDS $(TARGET_MAKE_ENV) CFLAGS="$(HOSTAPD_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(HOSTAPD_LIBS)" \ $(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(HOSTAPD_SUBDIR) endef diff --git a/package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch b/package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch new file mode 100644 index 0000000000..1cdc6c0af2 --- /dev/null +++ b/package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch @@ -0,0 +1,47 @@ +From 2efdcf332a40431c6584970bb0c68712d14d409b Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias <gustavo@zacarias.com.ar> +Date: Wed, 27 Nov 2013 10:18:11 -0300 +Subject: [PATCH] iptables/ip(6)tables-save.c: remove dlfcn.h include + +It's not required and breaks on static-only uClibc builds which don't +have the header file. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +--- + iptables/ip6tables-save.c | 4 ---- + iptables/iptables-save.c | 4 ---- + 2 files changed, 8 deletions(-) + +diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c +index d819b30..a86a64a 100644 +--- a/iptables/ip6tables-save.c ++++ b/iptables/ip6tables-save.c +@@ -18,10 +18,6 @@ + #include "ip6tables.h" + #include "ip6tables-multi.h" + +-#ifndef NO_SHARED_LIBS +-#include <dlfcn.h> +-#endif +- + static int show_counters = 0; + + static const struct option options[] = { +diff --git a/iptables/iptables-save.c b/iptables/iptables-save.c +index e599fce..2999c7f 100644 +--- a/iptables/iptables-save.c ++++ b/iptables/iptables-save.c +@@ -17,10 +17,6 @@ + #include "iptables.h" + #include "iptables-multi.h" + +-#ifndef NO_SHARED_LIBS +-#include <dlfcn.h> +-#endif +- + static int show_counters = 0; + + static const struct option options[] = { +-- +1.8.3.2 + diff --git a/package/json-glib/Config.in b/package/json-glib/Config.in index 09ac4e3d52..ea15295b38 100644 --- a/package/json-glib/Config.in +++ b/package/json-glib/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_JSON_GLIB bool "json-glib" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT help @@ -12,4 +13,5 @@ config BR2_PACKAGE_JSON_GLIB https://live.gnome.org/JsonGlib/ comment "json-glib needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/latencytop/Config.in b/package/latencytop/Config.in index 29fbcc8da9..b54ef052b4 100644 --- a/package/latencytop/Config.in +++ b/package/latencytop/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LATENCYTOP bool "latencytop" depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 select BR2_PACKAGE_NCURSES select BR2_PACKAGE_LIBGLIB2 help @@ -21,4 +22,5 @@ config BR2_PACKAGE_LATENCYTOP http://www.latencytop.org comment "latencytop needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libcap-ng/Config.in b/package/libcap-ng/Config.in index d1663cdefc..da5b447726 100644 --- a/package/libcap-ng/Config.in +++ b/package/libcap-ng/Config.in @@ -1,5 +1,6 @@ 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 diff --git a/package/libcurl/libcurl-0001-CVE-2013-4545.patch b/package/libcurl/libcurl-0001-CVE-2013-4545.patch new file mode 100644 index 0000000000..39545fec59 --- /dev/null +++ b/package/libcurl/libcurl-0001-CVE-2013-4545.patch @@ -0,0 +1,32 @@ +From 3c3622b66221d89509cffaa693fc7dcd5c5b96cf Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Wed, 2 Oct 2013 15:31:10 +0200 +Subject: [PATCH] OpenSSL: acknowledge CURLOPT_SSL_VERIFYHOST without + VERIFYPEER + +Setting only CURLOPT_SSL_VERIFYHOST without CURLOPT_SSL_VERIFYPEER set +should still verify that the host name fields in the server certificate +is fine or return failure. + +Bug: http://curl.haxx.se/mail/lib-2013-10/0002.html +Reported-by: Ishan SinghLevett +--- + lib/ssluse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ssluse.c b/lib/ssluse.c +index 4f3c1e1..9974ac8 100644 +--- a/lib/ssluse.c ++++ b/lib/ssluse.c +@@ -2351,7 +2351,7 @@ ossl_connect_step3(struct connectdata *conn, + * operations. + */ + +- if(!data->set.ssl.verifypeer) ++ if(!data->set.ssl.verifypeer && !data->set.ssl.verifyhost) + (void)servercert(conn, connssl, FALSE); + else + retcode = servercert(conn, connssl, TRUE); +-- +1.8.3.2 + diff --git a/package/libglade/Config.in b/package/libglade/Config.in index 774c7659ec..e269a07548 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLADE depends on BR2_PACKAGE_LIBGTK2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_ATK select BR2_PACKAGE_LIBXML2 @@ -14,5 +15,6 @@ config BR2_PACKAGE_LIBGLADE http://ftp.gnome.org/pub/GNOME/sources/libglade/ comment "libglade needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on BR2_PACKAGE_LIBGTK2 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 0e4664c8fa..7cbfea5dce 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -7,10 +7,12 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_ZLIB depends on BR2_USE_WCHAR # gettext depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() help Low-level core library that forms the basis of GTK+ and GNOME. http://www.gtk.org/ comment "libglib2 needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index 1dc8f2e3b3..5239c25ddf 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_PACKAGE_XORG7 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango help The GTK+ version 2 graphical user interface library @@ -32,6 +33,7 @@ config BR2_PACKAGE_LIBGTK2_DEMO endif comment "libgtk2 needs a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU depends on BR2_PACKAGE_XORG7 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk index 5a29923324..eddde33ec9 100644 --- a/package/libiscsi/libiscsi.mk +++ b/package/libiscsi/libiscsi.mk @@ -10,5 +10,7 @@ LIBISCSI_LICENSE = GPLv2+ LGPLv2.1+ LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt LIBISCSI_INSTALL_STAGING = YES LIBISCSI_DEPENDENCIES = popt +# fixes MIPS64 link failure +LIBISCSI_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/libmms/Config.in b/package/libmms/Config.in index 50e98d886a..11df6e5142 100644 --- a/package/libmms/Config.in +++ b/package/libmms/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBMMS bool "libmms" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 help LibMMS is a common library for parsing mms:// and mmsh:// @@ -13,4 +14,5 @@ config BR2_PACKAGE_LIBMMS http://launchpad.net/libmms comment "libmms needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libmpd/Config.in b/package/libmpd/Config.in index 83bb6cd89b..1e3b860063 100644 --- a/package/libmpd/Config.in +++ b/package/libmpd/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBMPD bool "libmpd" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -12,4 +13,5 @@ config BR2_PACKAGE_LIBMPD http://gmpcwiki.sarine.nl/index.php?title=Libmpd comment "libmpd needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in index 4ef3a518ee..1d732873d7 100644 --- a/package/libnspr/Config.in +++ b/package/libnspr/Config.in @@ -1,8 +1,12 @@ +config BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT + def_bool y + depends on !BR2_arc && !BR2_xtensa && !BR2_bfin + config BR2_PACKAGE_LIBNSPR bool "libnspr" depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_arc + depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT help NSPR is the Netscape Portable Runtime library which provides a platform-neutral API for system level and libc like @@ -12,5 +16,5 @@ config BR2_PACKAGE_LIBNSPR http://www.mozilla.org/projects/nspr/ comment "libnspr needs a toolchain w/ largefile, threads" - depends on !BR2_arc + depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libnspr/libnspr-nios2.patch b/package/libnspr/libnspr-nios2.patch new file mode 100644 index 0000000000..cffb2ef499 --- /dev/null +++ b/package/libnspr/libnspr-nios2.patch @@ -0,0 +1,71 @@ +Add Nios-II support + +Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> + +diff -Naur libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.cfg libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.cfg +--- libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.cfg 2013-11-10 21:15:04.556139100 -0300 ++++ libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.cfg 2013-11-10 21:15:29.332138283 -0300 +@@ -914,6 +914,51 @@ + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(nios2) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #else + + #error "Unknown CPU architecture" +diff -Naur libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.h libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.h +--- libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.h 2013-11-10 21:15:04.556139100 -0300 ++++ libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.h 2013-11-10 21:15:33.245138154 -0300 +@@ -55,6 +55,8 @@ + #define _PR_SI_ARCHITECTURE "avr32" + #elif defined(__m32r__) + #define _PR_SI_ARCHITECTURE "m32r" ++#elif defined(nios2) ++#define _PR_SI_ARCHITECTURE "nios2" + #else + #error "Unknown CPU architecture" + #endif diff --git a/package/libnss/Config.in b/package/libnss/Config.in index 88b1fde290..77128f6f6b 100644 --- a/package/libnss/Config.in +++ b/package/libnss/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBNSS select BR2_PACKAGE_ZLIB depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr - depends on !BR2_arc # libnspr + depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr help Network Security Services (NSS) is a set of libraries designed to support development of security-enabled client and server @@ -16,6 +16,6 @@ config BR2_PACKAGE_LIBNSS http://www.mozilla.org/projects/security/pki/nss/ comment "libnss needs a toolchain w/ largefile, threads" - depends on !BR2_arc + depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 9989b6d5bc..002e083e54 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.14.3 +LIBNSS_VERSION = 3.14.5 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION)) LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src diff --git a/package/libpfm4/Config.in b/package/libpfm4/Config.in index 6b491a4054..3908e7890b 100644 --- a/package/libpfm4/Config.in +++ b/package/libpfm4/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBPFM4 bool "libpfm4" + depends on !BR2_avr32 # no perf_event_open help A helper library to help encode Performance Events to use with Operating system kernels performance monitoring interfaces. diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in index dad012d9c1..113f650b1e 100644 --- a/package/libplayer/Config.in +++ b/package/libplayer/Config.in @@ -16,6 +16,10 @@ config BR2_PACKAGE_LIBPLAYER_MPLAYER depends on !BR2_sh4a && !BR2_sh4aeb && !BR2_microblaze && !BR2_aarch64 # mplayer depends on BR2_LARGEFILE + # mplayer + # Broken support for <ARMv5 + depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t \ + || BR2_arm920t || BR2_arm922t || BR2_fa526 || BR2_strongarm) select BR2_PACKAGE_MPLAYER config BR2_PACKAGE_LIBPLAYER_GSTREAMER diff --git a/package/libqmi/Config.in b/package/libqmi/Config.in index fc6b48d7f6..a0e896cce8 100644 --- a/package/libqmi/Config.in +++ b/package/libqmi/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBQMI select BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 help libqmi is a glib-based library for talking to WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. @@ -10,4 +11,5 @@ config BR2_PACKAGE_LIBQMI http://www.freedesktop.org/wiki/Software/libqmi/ comment "libqmi needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libroxml/libroxml-werror.patch b/package/libroxml/libroxml-0001-werror.patch index 6435b0195d..91f322ce0d 100644 --- a/package/libroxml/libroxml-werror.patch +++ b/package/libroxml/libroxml-0001-werror.patch @@ -11,7 +11,7 @@ Index: a/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -41,7 +41,7 @@ +@@ -46,7 +46,7 @@ # options override CPPFLAGS += -Iinc/ diff --git a/package/libroxml/libroxml-0002-wno-unused-result.patch b/package/libroxml/libroxml-0002-wno-unused-result.patch new file mode 100644 index 0000000000..406bf3c247 --- /dev/null +++ b/package/libroxml/libroxml-0002-wno-unused-result.patch @@ -0,0 +1,21 @@ +The -Wno-unused-result option is not understood by the version of gcc used by the +avr32 toolchain. Remove the option from the compilation flags. + +Fixes build failures such as the following. + + http://autobuild.buildroot.net/results/e22/e22d94fca3eabb4e54d82af04319f17ad8e10c20/ + +Signed-off-by: Simon Dawson <spdawson@gmail.com> + +diff -Nurp a/Makefile b/Makefile +--- a/Makefile 2013-11-21 17:13:17.679388374 +0000 ++++ b/Makefile 2013-11-21 17:13:35.219299157 +0000 +@@ -46,7 +46,7 @@ DEFINES = -DIGNORE_EMPTY_TEXT_NODES + + # options + override CPPFLAGS += -Iinc/ +-override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Iinc/ $(DEFINES) ++override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Iinc/ $(DEFINES) + override LDFLAGS += + + ifeq ("$(OS)", "Darwin") diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 13f6d06119..5dd4c58124 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_GDK_PIXBUF depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango help The rsvg library is an efficient renderer for Scalable @@ -16,4 +17,5 @@ config BR2_PACKAGE_LIBRSVG http://librsvg.sourceforge.net/ comment "librsvg needs a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/libsecret/Config.in b/package/libsecret/Config.in index b4557822fc..70f1fe7eb9 100644 --- a/package/libsecret/Config.in +++ b/package/libsecret/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSECRET select BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_WCHAR # gettext dep in libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 help libsecret is a library for storing and retrieving passwords and other secrets. It communicates with the "Secret Service" using DBus. @@ -12,4 +13,5 @@ config BR2_PACKAGE_LIBSECRET https://wiki.gnome.org/Libsecret comment "libsecret needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch b/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch new file mode 100644 index 0000000000..a916e9d343 --- /dev/null +++ b/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch @@ -0,0 +1,31 @@ +From 2a2dac797cc41fb3f106c4186fc68d3e15b4ea47 Mon Sep 17 00:00:00 2001 +From: Will Newton <will.newton@linaro.org> +Date: Tue, 28 May 2013 18:31:46 +0100 +Subject: [PATCH] m4/stack-direction.m4: AArch64 stack grows down. + +Submitted-Upstream: https://lists.gnu.org/archive/html/bug-libsigsegv/2013-05/msg00001.html + +ChangeLog: + +2013-05-28 Will Newton <will.newton@linaro.org> + + * m4/stack-direction.m4: AArch64 stack grows down. +--- + m4/stack-direction.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 +index 00e0445..890b77e 100644 +--- a/m4/stack-direction.m4 ++++ b/m4/stack-direction.m4 +@@ -13,6 +13,7 @@ AC_DEFUN([SV_STACK_DIRECTION], + case "$host_cpu" in + dnl See the #define STACK_GROWS_DOWNWARD in gcc-3.1/gcc/config/*/*.h. + a29k | \ ++ aarch64* | \ + alpha* | \ + arc | \ + arm* | strongarm* | xscale* | \ +-- +1.8.1.4 + diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 1eec1355d2..874f50cc1a 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSOUP bool "libsoup" depends on BR2_USE_WCHAR # glib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_SQLITE @@ -24,4 +25,5 @@ config BR2_PACKAGE_LIBSOUP_SSL endif comment "libsoup needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libtool/libtool-0001-mips64-n64-linking.patch b/package/libtool/libtool-0001-mips64-n64-linking.patch new file mode 100644 index 0000000000..ef9084ddb6 --- /dev/null +++ b/package/libtool/libtool-0001-mips64-n64-linking.patch @@ -0,0 +1,47 @@ +sets correct linker ABI flags on MIPS64 +http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=5f7f7d9615bf650cf99d581a33b3e18357f79951 + +Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> + +diff -ru libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4 +--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 2013-11-11 11:44:30.419396295 +0000 ++++ libtool-2.4.2/libltdl/m4/libtool.m4 2013-11-11 11:44:07.055032308 +0000 +@@ -1312,6 +1312,38 @@ + rm -rf conftest* + ;; + ++mips64*-*linux*) ++ # Find out what ABI is being produced by ac_compile, and set linker ++ # options accordingly. ++ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ emul=elf ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ emul="${emul}32" ++ ;; ++ *64-bit*) ++ emul="${emul}64" ++ ;; ++ esac ++ case `/usr/bin/file conftest.$ac_objext` in ++ *MSB*) ++ emul="${emul}btsmip" ++ ;; ++ *LSB*) ++ emul="${emul}ltsmip" ++ ;; ++ esac ++ case `/usr/bin/file conftest.$ac_objext` in ++ *N32*) ++ emul="${emul}n32" ++ ;; ++ esac ++ LD="${LD-ld} -m $emul" ++ fi ++ rm -rf conftest* ++ ;; ++ + x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index fe48838fda..f5a0aefca3 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -15,14 +15,19 @@ LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config # only used for examples LIBVNCSERVER_CONF_OPT += --with-sdl-config=/bin/false +ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBVNCSERVER_CONF_OPT += --without-pthread +endif + ifneq ($(BR2_INET_IPV6),y) LIBVNCSERVER_CONF_OPT += --without-ipv6 endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) +# openssl supports needs pthread +ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) LIBVNCSERVER_DEPENDENCIES += openssl else -LIBVNCSERVER_CONF_OPT += --without-crypto +LIBVNCSERVER_CONF_OPT += --without-crypto --without-ssl endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 2bd8b02ddc..7ed476bf13 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -83,14 +83,14 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.1.10" if BR2_KERNEL_HEADERS_3_1 default "3.2.52" if BR2_KERNEL_HEADERS_3_2 default "3.3.8" if BR2_KERNEL_HEADERS_3_3 - default "3.4.68" if BR2_KERNEL_HEADERS_3_4 + default "3.4.70" if BR2_KERNEL_HEADERS_3_4 default "3.5.7" if BR2_KERNEL_HEADERS_3_5 default "3.6.11" if BR2_KERNEL_HEADERS_3_6 default "3.7.10" if BR2_KERNEL_HEADERS_3_7 default "3.8.13" if BR2_KERNEL_HEADERS_3_8 default "3.9.11" if BR2_KERNEL_HEADERS_3_9 - default "3.10.18" if BR2_KERNEL_HEADERS_3_10 - default "3.11.7" if BR2_KERNEL_HEADERS_3_11 - default "3.12" if BR2_KERNEL_HEADERS_3_12 + default "3.10.20" if BR2_KERNEL_HEADERS_3_10 + default "3.11.9" if BR2_KERNEL_HEADERS_3_11 + default "3.12.1" if BR2_KERNEL_HEADERS_3_12 default "2.6" if BR2_KERNEL_HEADERS_SNAP default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/package/log4cxx/Config.in b/package/log4cxx/Config.in index 8791b8c433..bc142265a0 100644 --- a/package/log4cxx/Config.in +++ b/package/log4cxx/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LOG4CXX depends on !BR2_PREFER_STATIC_LIB depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # apr help Apache log4cxx is a logging framework for C++ patterned after Apache log4j. @@ -15,3 +16,4 @@ config BR2_PACKAGE_LOG4CXX comment "log4cxx needs a toolchain w/ C++, threads, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_PREFER_STATIC_LIB + depends on BR2_USE_MMU diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in index 3429e11cda..cb857c80be 100644 --- a/package/lttng-babeltrace/Config.in +++ b/package/lttng-babeltrace/Config.in @@ -4,12 +4,10 @@ config BR2_PACKAGE_LTTNG_BABELTRACE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_LIBGLIB2 - # libglib2 needs thread support and gettext which needs wchar support, and - # we also depends on util-linux which needs wchar - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - # util-linux depends on largefile support - depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR # libglib2, util-linux + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_LARGEFILE # util-linux help Babeltrace is part of the LTTng 2.x project. @@ -29,4 +27,5 @@ config BR2_PACKAGE_LTTNG_BABELTRACE comment "lttng-babeltrace needs a toolchain w/ wchar, threads, largefile" depends on BR2_PACKAGE_LTTNG_TOOLS + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/lua-ev/Config.in b/package/lua-ev/Config.in index 1e89c270a0..4f704ad54e 100644 --- a/package/lua-ev/Config.in +++ b/package/lua-ev/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LUA_EV bool "lua-ev" select BR2_PACKAGE_LIBEV + depends on !(BR2_avr32 || BR2_bfin) # libev help Get access to the libev library from Lua. diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in index b3988eaed1..5d6209fc12 100644 --- a/package/lvm2/Config.in +++ b/package/lvm2/Config.in @@ -16,19 +16,23 @@ config BR2_PACKAGE_LVM2 user-space. This makes it useful for not only LVM, but EVMS, software raid, and other drivers that create "virtual" block devices. -config BR2_PACKAGE_LVM2_DMSETUP_ONLY - bool "install dmsetup only" - depends on BR2_PACKAGE_LVM2 +if BR2_PACKAGE_LVM2 + +config BR2_PACKAGE_LVM2_STANDARD_INSTALL + bool "standard install instead of only dmsetup" + default y if !BR2_PACKAGE_LVM2_DMSETUP_ONLY # legacy 2013.11 help - Install dmsetup only and skip the LVM2 suite. + Install the standard suite of lvm2 programs. When this option is not + set, only dmsetup is installed. config BR2_PACKAGE_LVM2_APP_LIBRARY bool "install application library" - depends on BR2_PACKAGE_LVM2 - depends on !BR2_PACKAGE_LVM2_DMSETUP_ONLY + select BR2_PACKAGE_LVM2_STANDARD_INSTALL help Install application library (liblvm2app). +endif + comment "lvm2 needs a toolchain w/ largefile" depends on BR2_USE_MMU depends on !BR2_LARGEFILE diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 79a0d05061..4099c2101f 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -38,7 +38,7 @@ else LVM2_CONF_OPT += --disable-readline endif -ifeq ($(BR2_PACKAGE_LVM2_DMSETUP_ONLY),y) +ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),) LVM2_MAKE_OPT = device-mapper LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper diff --git a/package/lxc/Config.in b/package/lxc/Config.in index 3afb5b6b30..39cd577e67 100644 --- a/package/lxc/Config.in +++ b/package/lxc/Config.in @@ -3,7 +3,9 @@ config BR2_PACKAGE_LXC select BR2_PACKAGE_LIBCAP depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_LARGEFILE depends on BR2_USE_MMU # fork() + depends on !BR2_avr32 # no timerfd help Linux Containers (LXC), provides the ability to group and isolate of a set of processes in a jail by virtualizing and accounting the @@ -11,6 +13,7 @@ config BR2_PACKAGE_LXC http://lxc.sourceforge.net/ -comment "lxc needs a toolchain w/ IPv6, threads" +comment "lxc needs a toolchain w/ IPv6, threads, largefile" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_avr32 # no timerfd + depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE diff --git a/package/mdadm/Config.in b/package/mdadm/Config.in index c5133488f5..e0d606b5ec 100644 --- a/package/mdadm/Config.in +++ b/package/mdadm/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MDADM bool "mdadm" + depends on BR2_USE_MMU # fork() help Utility for managing Linux Software RAID arrays. diff --git a/package/mongoose/S85mongoose b/package/mongoose/S85mongoose index e9e8524ca8..dc042d0e2e 100755 --- a/package/mongoose/S85mongoose +++ b/package/mongoose/S85mongoose @@ -10,7 +10,7 @@ NAME=mongoose DESC="Mongoose HTTP server" DAEMON=`which mongoose` -OPTIONS="-max_threads 3 -root /var/www -ports 80" +OPTIONS="-num_threads 3 -document_root /var/www -listening_ports 80" [ -e /etc/default/mongoose ] && . /etc/default/mongoose @@ -28,12 +28,12 @@ case "$1" in restart|force-reload) echo -n "Restarting $DESC: " start-stop-daemon -K -x "$DAEMON" + sleep 1 start-stop-daemon -S -x "$DAEMON" -b -- $OPTIONS echo "$NAME." ;; *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 exit 1 ;; esac diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 9314984658..62bdfa7c52 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG) @@ -183,5 +184,6 @@ config BR2_PACKAGE_MPD_WAVPACK endif comment "mpd needs a toolchain w/ C++, threads, wchar" + depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in index 3a1b428ce6..c8f1480883 100644 --- a/package/mplayer/Config.in +++ b/package/mplayer/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MPLAYER bool "mplayer" # Those architectures are not supported by MPlayer depends on !(BR2_sh2 || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \ - || BR2_microblaze || BR2_aarch64) + || BR2_microblaze || BR2_aarch64 || BR2_nios2) # Broken support for <ARMv5 depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t \ || BR2_arm920t || BR2_arm922t || BR2_fa526 || BR2_strongarm) diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 3707e7753d..4609f723cc 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -13,6 +13,12 @@ NANO_CONF_OPT = --without-slang NANO_CONF_ENV = ac_cv_prog_NCURSESW_CONFIG=false NANO_DEPENDENCIES = ncurses +ifeq ($(BR2_PACKAGE_FILE),y) + NANO_DEPENDENCIES += file +else + NANO_CONF_ENV += ac_cv_lib_magic_magic_open=no +endif + ifeq ($(BR2_PACKAGE_NANO_TINY),y) NANO_CONF_OPT += --enable-tiny endif diff --git a/package/nbd/Config.in b/package/nbd/Config.in index 569218a504..a5ded2984b 100644 --- a/package/nbd/Config.in +++ b/package/nbd/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_NBD bool "nbd" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 help NBD is a set of utilities to configure network block devices, @@ -25,4 +26,5 @@ config BR2_NBD_SERVER endif comment "nbd needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/neard/Config.in b/package/neard/Config.in index 81bb61ea25..ed20e0604b 100644 --- a/package/neard/Config.in +++ b/package/neard/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_NEARD bool "neard" depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libnl, dbus, libglib2 - depends on BR2_USE_MMU # dbus + depends on BR2_USE_MMU # dbus, libglib2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBNL diff --git a/package/nut/nut.mk b/package/nut/nut.mk index 8cb8a019ea..25b88c4123 100644 --- a/package/nut/nut.mk +++ b/package/nut/nut.mk @@ -48,6 +48,14 @@ else NUT_CONF_OPT += --without-cgi endif +# libltdl (libtool) is needed for nut-scanner +ifeq ($(BR2_PACKAGE_LIBTOOL),y) +NUT_DEPENDENCIES += libtool +NUT_CONF_OPT += --with-libltdl +else +NUT_CONF_OPT += --without-libltdl +endif + ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) NUT_DEPENDENCIES += libusb-compat NUT_CONF_OPT += --with-usb diff --git a/package/ofono/Config.in b/package/ofono/Config.in index c431e08e0e..00df25186e 100644 --- a/package/ofono/Config.in +++ b/package/ofono/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_OFONO bool "ofono" depends on BR2_USE_WCHAR # gettext, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 - depends on BR2_USE_MMU # dbus + 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 @@ -15,5 +16,6 @@ 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 diff --git a/package/ola/ola-0001-fix-build-warning.patch b/package/ola/ola-0001-fix-build-warning.patch new file mode 100644 index 0000000000..1fdb58fb28 --- /dev/null +++ b/package/ola/ola-0001-fix-build-warning.patch @@ -0,0 +1,27 @@ +Fix build on 64 bits architectures + +This upstream patch fixes a warning that, due to -Werror, is causing +build failures on 64 bits architectures. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +commit ea375582b0bfee93d66608ffc807078ffc48e961 +Author: Simon Newton <nomis52@gmail.com> +Date: Wed Oct 30 09:23:49 2013 -0700 + + * Avoid a compiler warning + +diff --git a/plugins/e131/e131/PreamblePacker.cpp b/plugins/e131/e131/PreamblePacker.cpp +index ef29e18..8dfcc72 100644 +--- a/plugins/e131/e131/PreamblePacker.cpp ++++ b/plugins/e131/e131/PreamblePacker.cpp +@@ -77,7 +77,8 @@ const uint8_t *PreamblePacker::Pack(const PDUBlock<PDU> &pdu_block, + if (!m_send_buffer) + Init(); + +- unsigned int size = MAX_DATAGRAM_SIZE - sizeof(ACN_HEADER); ++ unsigned int size = MAX_DATAGRAM_SIZE - ++ static_cast<unsigned int>(sizeof(ACN_HEADER)); + if (!pdu_block.Pack(m_send_buffer + sizeof(ACN_HEADER), &size)) { + OLA_WARN << "Failed to pack E1.31 PDU"; + return NULL; diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 835ca4e504..bc7de24422 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -19,7 +19,8 @@ OLA_CONF_OPT = \ --disable-tcmalloc \ --disable-unittests \ --disable-root-check \ - --disable-java-libs + --disable-java-libs \ + --disable-fatal-warnings # sets where to find python libs built for target and required by ola OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages diff --git a/package/omniorb/Config.in b/package/omniorb/Config.in index 63266888e6..192ad54fc2 100644 --- a/package/omniorb/Config.in +++ b/package/omniorb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_OMNIORB bool "omniorb" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help omniORB is a robust high performance CORBA ORB for C++ and Python. omniORB is largely CORBA 2.6 compliant. omniORB is one of only @@ -10,5 +11,5 @@ config BR2_PACKAGE_OMNIORB http://omniorb.sourceforge.net/ -comment "omniORB needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "omniORB needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 4b8b0a4a1b..5416141168 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -73,7 +73,7 @@ define OPENSSL_CONFIGURE_CMDS --prefix=/usr \ --openssldir=/etc/ssl \ --libdir=/lib \ - threads \ + $(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \ $(if $(BR2_PREFER_STATIC_LIB),no-shared,shared) \ no-idea \ no-rc5 \ diff --git a/package/pango/Config.in b/package/pango/Config.in index 71d5b74ee8..774682d0fb 100644 --- a/package/pango/Config.in +++ b/package/pango/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PANGO bool "pango" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # freetype support select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_EXPAT @@ -20,5 +21,6 @@ config BR2_PACKAGE_PANGO http://www.pango.org/ comment "pango needs a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP diff --git a/package/php/php-01-no-iconv-search.patch b/package/php/php-01-no-iconv-search.patch new file mode 100644 index 0000000000..d2a7ae3a13 --- /dev/null +++ b/package/php/php-01-no-iconv-search.patch @@ -0,0 +1,32 @@ +Just assume ICONV_DIR is fine since we pass the correct parameters +to configure. +Otherwise configure will try to guess on absolute directories and +sometimes messes up on some weird edge conditions. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura php-5.3.27.orig/configure php-5.3.27/configure +--- php-5.3.27.orig/configure 2013-11-26 09:33:30.874253800 -0300 ++++ php-5.3.27/configure 2013-11-26 09:41:41.495363637 -0300 +@@ -48212,20 +48212,7 @@ + + + if test "$iconv_avail" != "no"; then +- if test -z "$ICONV_DIR"; then +- for i in /usr/local /usr; do +- if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then +- PHP_ICONV_PREFIX="$i" +- break +- fi +- done +- if test -z "$PHP_ICONV_PREFIX"; then +- PHP_ICONV_PREFIX="/usr" +- fi +- else +- PHP_ICONV_PREFIX="$ICONV_DIR" +- fi +- ++ PHP_ICONV_PREFIX="$ICONV_DIR" + CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" + LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" + diff --git a/package/php/php-no-iconv-search.patch b/package/php/php-no-iconv-search.patch deleted file mode 100644 index d1e924b1ab..0000000000 --- a/package/php/php-no-iconv-search.patch +++ /dev/null @@ -1,21 +0,0 @@ -Don't push LDFLAGS/CFLAGS for iconv. -Just assume they're covered somewhere else. -Otherwise we get -L/usr/lib and -I/usr/include search paths with uClibc -internal iconv support, which breaks things. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura php-5.3.13/configure php-5.3.13-iconv/configure ---- php-5.3.13/configure 2012-05-08 06:41:23.000000000 -0300 -+++ php-5.3.13-iconv/configure 2012-05-18 22:18:21.313975849 -0300 -@@ -47885,8 +47885,8 @@ - PHP_ICONV_PREFIX="$ICONV_DIR" - fi - -- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" -- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" -+ #CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" -+ #LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" - - if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then - PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in index 4a03e75a0a..52c0c32ba5 100644 --- a/package/pkg-config/Config.in +++ b/package/pkg-config/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PKG_CONFIG bool "pkg-config" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 depends on BR2_DEPRECATED select BR2_PACKAGE_LIBGLIB2 help @@ -14,4 +15,5 @@ config BR2_PACKAGE_PKG_CONFIG comment "pkg-config needs a toolchain w/ wchar, threads" depends on BR2_DEPRECATED + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/poco/poco.mk b/package/poco/poco.mk index a18f209c1f..3516c04455 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -34,6 +34,11 @@ ifeq ($(LIBC),uclibc) POCO_CONF_OPT += --no-fpenvironment --no-wstring endif +# sh4a is missing FE_DOWNWARD and FE_UPWARD in its fenv.h +ifeq ($(BR2_sh4a),y) +POCO_CONF_OPT += --no-fpenvironment +endif + define POCO_CONFIGURE_CMDS (cd $(@D); ./configure \ --config=Linux-CrossEnv \ diff --git a/package/polkit/Config.in b/package/polkit/Config.in index 26d65ab029..d685e5cc39 100644 --- a/package/polkit/Config.in +++ b/package/polkit/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_POLKIT bool "polkit" depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_EXPAT help @@ -12,4 +13,5 @@ config BR2_PACKAGE_POLKIT http://www.freedesktop.org/wiki/Software/polkit comment "polkit needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk index 31fb5932ba..271f6d812b 100644 --- a/package/protobuf-c/protobuf-c.mk +++ b/package/protobuf-c/protobuf-c.mk @@ -8,6 +8,7 @@ PROTOBUF_C_VERSION = 0.15 PROTOBUF_C_SITE = http://protobuf-c.googlecode.com/files PROTOBUF_C_DEPENDENCIES = protobuf host-protobuf-c HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf +PROTOBUF_C_MAKE = $(MAKE1) PROTOBUF_C_CONF_OPT = --disable-protoc PROTOBUF_C_INSTALL_STAGING = YES PROTOBUF_C_LICENSE = BSD-3c diff --git a/package/pv/Config.in b/package/pv/Config.in index 671f78e8c9..d7322963c0 100644 --- a/package/pv/Config.in +++ b/package/pv/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PV bool "pv" + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Pipe Viewer - is a terminal-based tool for monitoring the progress of data through a diff --git a/package/pv/pv.mk b/package/pv/pv.mk index 00502d3b4e..ab5190a43a 100644 --- a/package/pv/pv.mk +++ b/package/pv/pv.mk @@ -9,6 +9,7 @@ PV_SOURCE = pv-$(PV_VERSION).tar.bz2 PV_SITE = http://www.ivarch.com/programs/sources PV_LICENSE = Artistic-2.0 PV_LICENSE_FILES = doc/COPYING +PV_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) # While 'pv' uses autoconf, it does not use automake for its # makefiles. It uses $(LD) $(LDFLAGS) to achieve partial linking, but @@ -17,7 +18,7 @@ PV_LICENSE_FILES = doc/COPYING # the correct one. By passing the below values for LD and LDFLAGS, we # ensure that 'gcc' is used to do these partial linking steps. PV_MAKE_OPT = \ - LD=$(TARGET_CC) \ + LD="$(TARGET_CC)" \ LDFLAGS="-Wl,-r -nostdlib" $(eval $(autotools-package)) diff --git a/package/qt/Config.in b/package/qt/Config.in index 2651d55901..dd2b6d9ec9 100644 --- a/package/qt/Config.in +++ b/package/qt/Config.in @@ -385,6 +385,7 @@ config BR2_PACKAGE_QT_OPENSSL config BR2_PACKAGE_QT_SCRIPT bool "Script Module" + depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT default y help Build the Qt Script module. diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 82ce51dbd0..7f799fdb99 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -35,6 +35,7 @@ endif QT_CFLAGS = $(TARGET_CFLAGS) QT_CXXFLAGS = $(TARGET_CXXFLAGS) +QT_LDFLAGS = $(TARGET_LDFLAGS) ifeq ($(BR2_LARGEFILE),y) QT_CONFIGURE_OPTS += -largefile @@ -320,6 +321,9 @@ endif ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y) QT_CONFIGURE_OPTS += -opengl es2 -egl QT_DEPENDENCIES += libgles libegl +QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl) +QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl) +QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl) else QT_CONFIGURE_OPTS += -no-opengl endif @@ -490,7 +494,7 @@ define QT_CONFIGURE_CMDS $(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D)) $(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D)) $(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D)) - $(call QT_QMAKE_SET,QMAKE_LFLAGS,$(TARGET_LDFLAGS),$(@D)) + $(call QT_QMAKE_SET,QMAKE_LFLAGS,$(QT_LDFLAGS),$(@D)) $(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/usr/bin/pkg-config,$(@D)) # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target # instead of the host then. So set PKG_CONFIG* manually. diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 42724dc15d..b92d3292b6 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -9,6 +9,7 @@ menuconfig BR2_PACKAGE_QT5 depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_PACKAGE_QT + depends on !BR2_mips64 || !BR2_MIPS_NABI64 help This option enables the Qt5 framework. Sub-options allow to select which modules should be built. diff --git a/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch index b0011f6c35..51cea04763 100644 --- a/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch +++ b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch @@ -136,12 +136,11 @@ diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 58d4ddd..072502c 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri -@@ -1,6 +1,7 @@ +@@ -1,5 +1,6 @@ CONFIG(release, debug|release):DEFINES *= NDEBUG DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS +contains(QT_CONFIG, posix_fallocate):DEFINES += HAVE_POSIX_FALLOCATE=1 - winrt: DEFINES += SQLITE_OS_WINRT INCLUDEPATH += $$PWD/sqlite SOURCES += $$PWD/sqlite/sqlite3.c diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c diff --git a/package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch b/package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch new file mode 100644 index 0000000000..906b56a0d4 --- /dev/null +++ b/package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch @@ -0,0 +1,29 @@ +Set loadAcquire() as const + +Fixes powerpc build. + +Fetched-from: https://bugzilla.redhat.com/attachment.cgi?id=812643 +Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> + +Index: qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h +=================================================================== +--- qtbase-opensource-src-5.1.1.orig/src/corelib/thread/qoldbasicatomic.h ++++ qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h +@@ -63,7 +63,7 @@ public: + // Atomic API, implemented in qatomic_XXX.h + + int load() const { return _q_value; } +- int loadAcquire() { return _q_value; } ++ int loadAcquire() const { return _q_value; } + void store(int newValue) { _q_value = newValue; } + void storeRelease(int newValue) { _q_value = newValue; } + +@@ -107,7 +107,7 @@ public: + // Atomic API, implemented in qatomic_XXX.h + + T *load() const { return _q_value; } +- T *loadAcquire() { return _q_value; } ++ T *loadAcquire() const { return _q_value; } + void store(T *newValue) { _q_value = newValue; } + void storeRelease(T *newValue) { _q_value = newValue; } + diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 995e42d4b9..19a64884a9 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUAGGA_VERSION = 0.99.22.3 +QUAGGA_VERSION = 0.99.22.4 QUAGGA_SOURCE = quagga-$(QUAGGA_VERSION).tar.xz QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga QUAGGA_DEPENDENCIES = host-gawk diff --git a/package/ruby/Config.in b/package/ruby/Config.in index 9b505019ce..0de756ba9c 100644 --- a/package/ruby/Config.in +++ b/package/ruby/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_RUBY bool "ruby" depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS help Object Oriented Scripting Language. http://www.ruby-lang.org/ -comment "ruby needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR +comment "ruby needs a toolchain w/ wchar, threads" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index ea19008f54..a9c4e7db42 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUBY_VERSION = 1.9.3-p448 +RUBY_VERSION = 1.9.3-p484 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9 RUBY_DEPENDENCIES = host-pkgconf host-ruby HOST_RUBY_DEPENDENCIES = host-pkgconf diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk index 730bd06ea3..673c1a672d 100644 --- a/package/schifra/schifra.mk +++ b/package/schifra/schifra.mk @@ -23,11 +23,11 @@ endef define SCHIFRA_INSTALL_EXAMPLES cd $(@D) && for i in `find -type f -name 'schifra_*' -executable` ; \ do \ - $(INSTALL) -m 0755 -D $$i (TARGET_DIR)/usr/bin/$$i; \ + $(INSTALL) -m 0755 -D $$i $(TARGET_DIR)/usr/bin/$$i; \ done endef -SCHIFRA_POST_TARGET_INSTALL_HOOKS += SCHIFRA_INSTALL_EXAMPLES +SCHIFRA_POST_INSTALL_TARGET_HOOKS += SCHIFRA_INSTALL_EXAMPLES endif define SCHIFRA_INSTALL_TARGET_CMDS diff --git a/package/shared-mime-info/Config.in b/package/shared-mime-info/Config.in index 7be199d9f8..91a5a15a05 100644 --- a/package/shared-mime-info/Config.in +++ b/package/shared-mime-info/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_SHARED_MIME_INFO bool "shared-mime-info" depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBXML2 help @@ -12,4 +13,5 @@ config BR2_PACKAGE_SHARED_MIME_INFO http://freedesktop.org/wiki/Software/shared-mime-info comment "shared-mime-info needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 04a26c6de6..bff308c2fd 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -6,7 +6,7 @@ SQUASHFS_VERSION = 4.2 SQUASHFS_SOURCE = squashfs$(SQUASHFS_VERSION).tar.gz -SQUASHFS_SITE = http://downloads.sourceforge.net/projct/squashfs/squashfs/squashfs$(SQUASHFS_VERSION) +SQUASHFS_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs$(SQUASHFS_VERSION) # no libattr in BR SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0 diff --git a/package/squid/squid-03-missing-include-time_h.patch b/package/squid/squid-03-missing-include-time_h.patch new file mode 100644 index 0000000000..18b3ab3b55 --- /dev/null +++ b/package/squid/squid-03-missing-include-time_h.patch @@ -0,0 +1,28 @@ +ipc/Kid.cc: add missing include of time.h + +Function time() comes from <time.h>, so add the necessary include. +This fixes compilation on some configurations, for example +http://autobuild.buildroot.net/results/b33/b33e1f41e50b6e7ac3e30806b9a617d451bc27b4/ + +Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> +Upstream-status: submitted (http://bugs.squid-cache.org/show_bug.cgi?id=3967) + +--- + src/ipc/Kid.cc | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + + +diff --git a/src/ipc/Kid.cc b/src/ipc/Kid.cc +--- a/src/ipc/Kid.cc ++++ b/src/ipc/Kid.cc +@@ -11,6 +11,10 @@ + #include <sys/wait.h> + #endif + ++#if HAVE_TIME_H ++#include <time.h> ++#endif ++ + int TheProcessKind = pkOther; + + Kid::Kid(): diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in index 2ce627f56b..aa7628dca2 100644 --- a/package/sshfs/Config.in +++ b/package/sshfs/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_SSHFS depends on BR2_LARGEFILE depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2 - depends on BR2_USE_MMU # libfuse + depends on BR2_USE_MMU # libfuse, glib2 depends on !BR2_PREFER_STATIC_LIB # libfuse help FUSE filesystem client based on the SSH File Transfer Protocol. diff --git a/package/subversion/Config.in b/package/subversion/Config.in index c1358fee78..cc2549f662 100644 --- a/package/subversion/Config.in +++ b/package/subversion/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_SUBVERSION select BR2_PACKAGE_APR_UTIL # apr really needs shared library support depends on !BR2_PREFER_STATIC_LIB + depends on BR2_USE_MMU # apr select BR2_PACKAGE_NEON select BR2_PACKAGE_NEON_XML help diff --git a/package/sunxi-mali/egl.pc b/package/sunxi-mali/egl.pc index 56e3990c65..b062ad1d35 100644 --- a/package/sunxi-mali/egl.pc +++ b/package/sunxi-mali/egl.pc @@ -8,5 +8,5 @@ Description: ARM Mali implementation of EGL Version: 1.4 Requires: Libs: -L${libdir} -lEGL -lGLESv2 -lUMP -Cflags: -I{includedir}/EGL/ -I${includedir} +Cflags: -I${includedir}/EGL/ -I${includedir} diff --git a/package/swig/swig.mk b/package/swig/swig.mk index 94395ee10d..79839ea7ff 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -7,7 +7,10 @@ SWIG_VERSION = 2.0.10 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) SWIG_DEPENDENCIES = host-bison -HOST_SWIG_CONF_OPT = --without-pcre --disable-ccache +HOST_SWIG_CONF_OPT = \ + --without-pcre \ + --disable-ccache \ + --without-octave SWIG_LICENSE = GPLv3+ BSD-2c BSD-3c SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in index 0bb0791571..e1b0488e84 100644 --- a/package/sysprof/Config.in +++ b/package/sysprof/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_SYSPROF select BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 # In its util.h file, sysprof contains architecture-specific # code depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb @@ -25,5 +26,6 @@ config BR2_PACKAGE_SYSPROF_GUI endif comment "sysprof needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ti-gfx/egl.pc b/package/ti-gfx/egl.pc index 5ae5a9de39..223fb04b98 100644 --- a/package/ti-gfx/egl.pc +++ b/package/ti-gfx/egl.pc @@ -8,4 +8,4 @@ Description: TI Graphics SDK implementation of EGL Version: 1.9.2188537 Requires: Libs: -L${libdir} -lEGL -lGLESv2 -lIMGegl -Cflags: -I{includedir}/EGL/ -I${includedir} +Cflags: -I${includedir}/EGL/ -I${includedir} diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in index 0d45532e26..8f6e1a2b35 100644 --- a/package/tinymembench/Config.in +++ b/package/tinymembench/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench" + depends on !BR2_MIPS_NABI32 && !BR2_MIPS_NABI64 help Tinymembench is a simple memory benchmark program, which tries to measure the peak bandwidth of sequential memory diff --git a/package/ttcp/Config.in b/package/ttcp/Config.in index 0262fc9e33..cf68eff33c 100644 --- a/package/ttcp/Config.in +++ b/package/ttcp/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_TTCP help Benchmarking tool for determining TCP and UDP performance. - ftp://ftp.sunet.se/pub/network/monitoring/ttcp/ + ftp://ftp.sgi.com/sgi/src/ttcp/README diff --git a/package/ttcp/ttcp-bcopy.patch b/package/ttcp/ttcp-0001-replace-deprecated-bcopy.patch index c98c88f360..fb8ef7ff45 100644 --- a/package/ttcp/ttcp-bcopy.patch +++ b/package/ttcp/ttcp-0001-replace-deprecated-bcopy.patch @@ -1,6 +1,9 @@ -diff -urN ttcp-0rig/ttcp.c ttcp/ttcp.c ---- ttcp-0rig/ttcp.c 1993-05-17 00:00:00.000000000 +0200 -+++ ttcp/ttcp.c 2009-01-14 23:46:19.000000000 +0100 +Replace deprecated bcopy call by using memmove instead. + +Index: b/ttcp.c +=================================================================== +--- a/ttcp.c ++++ b/ttcp.c @@ -241,7 +241,7 @@ if ((addr=gethostbyname(host)) == NULL) err("bad hostname"); diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk index b65949de56..7667b20617 100644 --- a/package/ttcp/ttcp.mk +++ b/package/ttcp/ttcp.mk @@ -4,9 +4,8 @@ # ################################################################################ -# -TTCP_VERSION = -TTCP_SITE = http://ftp.sunet.se/pub/network/monitoring/ttcp +TTCP_VERSION = 1.12 +TTCP_SITE = ftp://ftp.sgi.com/sgi/src/ttcp/ TTCP_SOURCE = ttcp.c TTCP_LICENSE = public domain diff --git a/package/tvheadend/tvheadend-003-remove-werror.patch b/package/tvheadend/tvheadend-003-remove-werror.patch new file mode 100644 index 0000000000..1b0e68797a --- /dev/null +++ b/package/tvheadend/tvheadend-003-remove-werror.patch @@ -0,0 +1,15 @@ +tvheadend: remove -Werror from CFLAGS + +Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> + +--- tvheadend-2b649954346aa2e9c81834d500a25c528f31f829/Makefile.orig 2013-11-28 15:52:52.284041848 +0000 ++++ tvheadend-2b649954346aa2e9c81834d500a25c528f31f829/Makefile 2013-11-28 15:53:03.715220194 +0000 +@@ -27,7 +27,7 @@ PROG := $(BUILDDIR)/tvheadend + # Common compiler flags + # + +-CFLAGS += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations ++CFLAGS += -Wall -Wwrite-strings -Wno-deprecated-declarations + CFLAGS += -Wmissing-prototypes -fms-extensions + CFLAGS += -g -funsigned-char -O2 + CFLAGS += -D_FILE_OFFSET_BITS=64 diff --git a/package/uclibc/0.9.31.1/uClibc-0001-add-bsd-endian-conversions.patch b/package/uclibc/0.9.31.1/uclibc-0001-add-bsd-endian-conversions.patch index 652d7c9f10..652d7c9f10 100644 --- a/package/uclibc/0.9.31.1/uClibc-0001-add-bsd-endian-conversions.patch +++ b/package/uclibc/0.9.31.1/uclibc-0001-add-bsd-endian-conversions.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0002-add-inotify-init1.patch b/package/uclibc/0.9.31.1/uclibc-0002-add-inotify-init1.patch index cbec426238..cbec426238 100644 --- a/package/uclibc/0.9.31.1/uClibc-0002-add-inotify-init1.patch +++ b/package/uclibc/0.9.31.1/uclibc-0002-add-inotify-init1.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0003-add-sock-cloexec.patch b/package/uclibc/0.9.31.1/uclibc-0003-add-sock-cloexec.patch index a7089a98ac..a7089a98ac 100644 --- a/package/uclibc/0.9.31.1/uClibc-0003-add-sock-cloexec.patch +++ b/package/uclibc/0.9.31.1/uclibc-0003-add-sock-cloexec.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0004-export-strverscmp.patch b/package/uclibc/0.9.31.1/uclibc-0004-export-strverscmp.patch index 19bc021b88..19bc021b88 100644 --- a/package/uclibc/0.9.31.1/uClibc-0004-export-strverscmp.patch +++ b/package/uclibc/0.9.31.1/uclibc-0004-export-strverscmp.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0005-fix-daylight-saving-time-handling.patch b/package/uclibc/0.9.31.1/uclibc-0005-fix-daylight-saving-time-handling.patch index 5a96113877..5a96113877 100644 --- a/package/uclibc/0.9.31.1/uClibc-0005-fix-daylight-saving-time-handling.patch +++ b/package/uclibc/0.9.31.1/uclibc-0005-fix-daylight-saving-time-handling.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0006-fix-error-locale-utf-8.patch b/package/uclibc/0.9.31.1/uclibc-0006-fix-error-locale-utf-8.patch index 1305add50a..1305add50a 100644 --- a/package/uclibc/0.9.31.1/uClibc-0006-fix-error-locale-utf-8.patch +++ b/package/uclibc/0.9.31.1/uclibc-0006-fix-error-locale-utf-8.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0007-linuxthreads-errno-fix.patch b/package/uclibc/0.9.31.1/uclibc-0007-linuxthreads-errno-fix.patch index c49821bde7..c49821bde7 100644 --- a/package/uclibc/0.9.31.1/uClibc-0007-linuxthreads-errno-fix.patch +++ b/package/uclibc/0.9.31.1/uclibc-0007-linuxthreads-errno-fix.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0008-more-workarounds-GCC-PR32219.patch b/package/uclibc/0.9.31.1/uclibc-0008-more-workarounds-GCC-PR32219.patch index 9e6953224c..9e6953224c 100644 --- a/package/uclibc/0.9.31.1/uClibc-0008-more-workarounds-GCC-PR32219.patch +++ b/package/uclibc/0.9.31.1/uclibc-0008-more-workarounds-GCC-PR32219.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0009-unshare.patch b/package/uclibc/0.9.31.1/uclibc-0009-unshare.patch index ad440d9dc2..ad440d9dc2 100644 --- a/package/uclibc/0.9.31.1/uClibc-0009-unshare.patch +++ b/package/uclibc/0.9.31.1/uclibc-0009-unshare.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0010-workaround-GCC-PR32219.patch b/package/uclibc/0.9.31.1/uclibc-0010-workaround-GCC-PR32219.patch index 242a5264b8..242a5264b8 100644 --- a/package/uclibc/0.9.31.1/uClibc-0010-workaround-GCC-PR32219.patch +++ b/package/uclibc/0.9.31.1/uclibc-0010-workaround-GCC-PR32219.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0011-startfiles-Make-targets.patch b/package/uclibc/0.9.31.1/uclibc-0011-startfiles-Make-targets.patch index 9a7f3045c5..9a7f3045c5 100644 --- a/package/uclibc/0.9.31.1/uClibc-0011-startfiles-Make-targets.patch +++ b/package/uclibc/0.9.31.1/uclibc-0011-startfiles-Make-targets.patch diff --git a/package/uclibc/0.9.31.1/uClibc-0012-netlinkaccess-header-types.patch.avr32 b/package/uclibc/0.9.31.1/uclibc-0012-netlinkaccess-header-types.patch index bc981a4171..bc981a4171 100644 --- a/package/uclibc/0.9.31.1/uClibc-0012-netlinkaccess-header-types.patch.avr32 +++ b/package/uclibc/0.9.31.1/uclibc-0012-netlinkaccess-header-types.patch diff --git a/package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch b/package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch new file mode 100644 index 0000000000..55cb0c57b4 --- /dev/null +++ b/package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch @@ -0,0 +1,21 @@ +libc/sysdeps: add __kernel_long and __kernel_ulong + +Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various +exported header files were updated to use these new types. Add the +definitions for __kernel_long_t and __kernel_ulong_t to the relevant +kernel_types.h headers. + +Signed-off-by: Simon Dawson <spdawson@gmail.com> + +diff -Nurp a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h +--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h 2011-06-08 19:58:40.000000000 +0100 ++++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h 2013-11-15 08:01:09.209037851 +0000 +@@ -39,6 +39,8 @@ typedef unsigned int __kernel_gid32_t; + typedef unsigned short __kernel_old_uid_t; + typedef unsigned short __kernel_old_gid_t; + typedef unsigned short __kernel_old_dev_t; ++typedef long __kernel_long_t; ++typedef unsigned long __kernel_ulong_t; + + #ifdef __GNUC__ + typedef long long __kernel_loff_t; diff --git a/package/uclibc/uClibc-snapshot.config b/package/uclibc/uClibc-snapshot.config index 145f70926f..9ca3f9ea98 100644 --- a/package/uclibc/uClibc-snapshot.config +++ b/package/uclibc/uClibc-snapshot.config @@ -116,6 +116,7 @@ MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y # COMPAT_ATEXIT is not set +UCLIBC_SUSV2_LEGACY=y UCLIBC_SUSV3_LEGACY=y # UCLIBC_SUSV3_LEGACY_MACROS is not set UCLIBC_SUSV4_LEGACY=y diff --git a/package/udev/Config.in b/package/udev/Config.in index 2bcd685281..c8aedd02ed 100644 --- a/package/udev/Config.in +++ b/package/udev/Config.in @@ -28,11 +28,13 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS select BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 help Enable all extras with external dependencies like libacl, hwdata and libglib2 comment "enabling all extras needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS endif diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index 28855dd003..08e942ae19 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -20,7 +20,8 @@ UDISKS_DEPENDENCIES = \ lvm2 \ libatasmart -UDISKS_CONF_OPT = --disable-remote-access +UDISKS_CONF_OPT = --disable-remote-access \ + $(if $(BR2_HAVE_DOCUMENTATION),,--disable-man-pages) ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y) UDISKS_CONF_OPT += --enable-lvm2 diff --git a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch index 72a060e29c..c95b7553e0 100644 --- a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch +++ b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch @@ -124,7 +124,7 @@ ported to util-linux-2.23.2 "%jd" /* (4) used */ "%d", /* priority */ -+#ifndef HAVE_SCANF_MS_MODIFIER ++#ifdef HAVE_SCANF_MS_MODIFIER &src, &fs->swaptype, +#else diff --git a/package/vala/Config.in b/package/vala/Config.in index d947c4aa33..b9477bf9f1 100644 --- a/package/vala/Config.in +++ b/package/vala/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_VALA depends on BR2_DEPRECATED depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE @@ -14,4 +15,5 @@ config BR2_PACKAGE_VALA comment "vala needs a toolchain w/ wchar, threads" depends on BR2_DEPRECATED + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/vim/Config.in b/package/vim/Config.in index 891715eb57..0b2f4b5b85 100644 --- a/package/vim/Config.in +++ b/package/vim/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_VIM bool "vim" depends on BR2_USE_MMU # uses fork() select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help VIM Text editor diff --git a/package/vim/vim-0001-fix-nls-check.patch b/package/vim/vim-0001-fix-nls-check.patch new file mode 100644 index 0000000000..ce5854932f --- /dev/null +++ b/package/vim/vim-0001-fix-nls-check.patch @@ -0,0 +1,120 @@ +configure: use minimal LIBS during gettext check + +In some configurations, vim fails to link correctly with messages such as: +edit.c:(.text+0x1614): undefined reference to `libintl_gettext' + +In particular, this has been seen by the buildroot autobuilds (see [1]) but +has also been reported at [2] and [3]. + +In the bad case, the configure script says: +checking for NLS... gettext() works +In the good case, it says: +checking for NLS... gettext() works with -lintl + +In the bad case, the system has libelf, vim detects that and takes it along +in $LIBS. Libelf needs libintl on this system, and so linking the test +program with -lelf will automatically take -lintl too. This causes configure +to think gettext() does not need libintl, while in reality it does. + +In the good case, libelf is not present and thus not used. The first +configure test for gettext fails, and then configure retries with -lintl +(which succeeds). + +Until now, there isn't really a problem. In both cases, you could link +correctly. In the 'bad' case, libintl is implicitly taken through libelf, in +the second case it is explicitly taken. + +The real problem occurs because configure also tests whether the linker +supports --as-needed and uses it when possible, instead of the link.sh +script. However, --as-needed seems to cause libintl NOT to be taken in the +bad case, causing the undefined references to libintl_gettext. + +This patch changes the configure script so that the gettext check does not +use additional libraries such as libelf. The test program is linked either +with nothing, or with libintl alone. This will cause libintl to +be added explicitly to LIBS, when needed. + +[1] http://autobuild.buildroot.net/results/21b5a910e6a27fa1cb12d0002ffed7e6ed9d6c83/ +[2] http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2012-November/243930.html +[3] http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2012-May/234184.html + + +Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> +Upstream-status: accepted (http://article.gmane.org/gmane.editors.vim.devel/43528) + +--- + src/auto/configure | 11 ++++++----- + src/configure.in | 13 +++++++++---- + 2 files changed, 15 insertions(+), 9 deletions(-) + +diff --git a/src/auto/configure b/src/auto/configure +--- a/src/auto/configure ++++ b/src/auto/configure +@@ -12271,6 +12271,8 @@ fi + if test -f po/Makefile; then + have_gettext="no" + if test -n "$MSGFMT"; then ++ olibs=$LIBS ++ LIBS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <libintl.h> +@@ -12284,10 +12286,9 @@ gettext("Test"); + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works" >&5 +-$as_echo "gettext() works" >&6; }; have_gettext="yes" +-else +- olibs=$LIBS +- LIBS="$LIBS -lintl" ++$as_echo "gettext() works" >&6; }; have_gettext="yes"; LIBS=$olibs; ++else ++ LIBS="-lintl" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <libintl.h> +@@ -12301,7 +12302,7 @@ gettext("Test"); + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works with -lintl" >&5 +-$as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes" ++$as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes"; LIBS="$olibs -lintl"; + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5 + $as_echo "gettext() doesn't work" >&6; }; +diff --git a/src/configure.in b/src/configure.in +--- a/src/configure.in ++++ b/src/configure.in +@@ -3484,6 +3484,9 @@ if test "$MANDEF" = "man -s"; then + fi + + dnl Check if gettext() is working and if it needs -lintl ++dnl We take care to base this on an empty LIBS: on some systems libelf would be ++dnl in LIBS and implicitly take along libintl. The final LIBS would then not ++dnl contain libintl, and the link step would fail due to -Wl,--as-needed. + AC_MSG_CHECKING(--disable-nls argument) + AC_ARG_ENABLE(nls, + [ --disable-nls Don't support NLS (gettext()).], , +@@ -3502,16 +3505,18 @@ if test "$enable_nls" = "yes"; then + if test -f po/Makefile; then + have_gettext="no" + if test -n "$MSGFMT"; then ++ olibs=$LIBS ++ LIBS="" + AC_TRY_LINK( + [#include <libintl.h>], + [gettext("Test");], +- AC_MSG_RESULT([gettext() works]); have_gettext="yes", +- olibs=$LIBS +- LIBS="$LIBS -lintl" ++ AC_MSG_RESULT([gettext() works]); have_gettext="yes"; LIBS=$olibs, ++ LIBS="-lintl" + AC_TRY_LINK( + [#include <libintl.h>], + [gettext("Test");], +- AC_MSG_RESULT([gettext() works with -lintl]); have_gettext="yes", ++ AC_MSG_RESULT([gettext() works with -lintl]); have_gettext="yes"; ++ LIBS="$olibs -lintl", + AC_MSG_RESULT([gettext() doesn't work]); + LIBS=$olibs)) + else diff --git a/package/vim/vim.mk b/package/vim/vim.mk index ca8131c622..bd909cd702 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -8,7 +8,7 @@ VIM_SITE = https://vim.googlecode.com/hg VIM_SITE_METHOD = hg # 7.3 release patchlevel 762 VIM_VERSION = 699f8d8f096d -VIM_DEPENDENCIES = ncurses +VIM_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) VIM_SUBDIR = src VIM_CONF_ENV = vim_cv_toupper_broken=no \ vim_cv_terminfo=yes \ diff --git a/package/wayland/Config.in b/package/wayland/Config.in index 260832fe79..c92f9ea1fc 100644 --- a/package/wayland/Config.in +++ b/package/wayland/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_WAYLAND bool "wayland" + depends on !BR2_avr32 # no epoll_create1, timerfd_create or timerfd_settime depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_EXPAT @@ -11,4 +12,5 @@ config BR2_PACKAGE_WAYLAND http://wayland.freedesktop.org/ comment "wayland needs a toolchain w/ threads" + depends on !BR2_avr32 depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/weston/Config.in b/package/weston/Config.in index b7f8468fb9..247efc8883 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -1,4 +1,5 @@ comment "weston needs udev and a toolchain w/ threads" + depends on !BR2_avr32 depends on !BR2_PACKAGE_UDEV || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_WESTON @@ -11,6 +12,7 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_JPEG select BR2_PACKAGE_MTDEV depends on BR2_PACKAGE_UDEV + depends on !BR2_avr32 # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index 6b756a62c9..f559c220cd 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_WIRESHARK select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 help diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 450e10f540..4ae41c10f7 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -137,7 +137,7 @@ endef define WPA_SUPPLICANT_BUILD_CMDS $(TARGET_MAKE_ENV) CFLAGS="$(WPA_SUPPLICANT_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" BINDIR=/usr/sbin \ $(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(WPA_SUPPLICANT_SUBDIR) endef diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk index b4f7d89297..41155a740f 100644 --- a/package/wvstreams/wvstreams.mk +++ b/package/wvstreams/wvstreams.mk @@ -22,7 +22,8 @@ WVSTREAMS_CONF_OPT += \ --with-openssl \ --with-zlib \ --without-pam \ - --disable-warnings + --disable-warnings \ + --without-tcl # needed for openssl detection when statically linking (as ssl needs lz) WVSTREAMS_CONF_ENV += LIBS=-lz @@ -38,13 +39,6 @@ else WVSTREAMS_CONF_OPT += --without-dbus endif -ifeq ($(BR2_PACKAGE_TCL),y) - WVSTREAMS_DEPENDENCIES += tcl - WVSTREAMS_CONF_OPT += --with-tcl -else - WVSTREAMS_CONF_OPT += --without-tcl -endif - ifeq ($(BR2_PACKAGE_QT),y) WVSTREAMS_DEPENDENCIES += qt WVSTREAMS_CONF_OPT += --with-qt diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index f8dd3dee5d..94df0ffab4 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -32,9 +32,6 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC This option selects eglibc as the C library for the cross-compilation toolchain. - The eglibc support in the Buildroot toolchain backend is - very recent, and therefore marked experimental. - http://eglibc.org config BR2_TOOLCHAIN_BUILDROOT_GLIBC @@ -52,9 +49,6 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC This option selects glibc as the C library for the cross-compilation toolchain. - The glibc support in the Buildroot toolchain backend is - very recent, and therefore marked experimental. - http://www.gnu.org/software/libc/ comment "(e)glibc only available with shared lib support" |
