diff options
Diffstat (limited to 'package')
128 files changed, 1194 insertions, 563 deletions
diff --git a/package/acl/acl.mk b/package/acl/acl.mk index 130ad10258..35d2f9b9ca 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -10,6 +10,8 @@ ACL_SITE = http://download.savannah.gnu.org/releases/acl ACL_INSTALL_STAGING = YES ACL_DEPENDENCIES = attr ACL_CONF_OPT = --enable-gettext=no +ACL_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries) +ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL # While the configuration system uses autoconf, the Makefiles are # hand-written and do not use automake. Therefore, we have to hack diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index 1f4ec3172b..7a6a478ed4 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -17,7 +17,7 @@ endef define ACPID_SET_EVENTS mkdir -p $(TARGET_DIR)/etc/acpi/events - /bin/echo -e "event=button[ /]power\naction=/sbin/poweroff" \ + printf "event=button[ /]power\naction=/sbin/poweroff\n" \ >$(TARGET_DIR)/etc/acpi/events/powerbtn endef diff --git a/package/armadillo/Config.in b/package/armadillo/Config.in index 898564d22f..c7a680afc0 100644 --- a/package/armadillo/Config.in +++ b/package/armadillo/Config.in @@ -2,6 +2,7 @@ comment "armadillo needs a toolchain w/ C++, largefile" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) # clapack depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) # clapack + depends on !BR2_bfin # clapack config BR2_PACKAGE_ARMADILLO bool "armadillo" @@ -9,6 +10,7 @@ config BR2_PACKAGE_ARMADILLO depends on BR2_LARGEFILE # clapack depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) # clapack depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) # clapack + depends on !BR2_bfin # clapack select BR2_PACKAGE_CLAPACK help Armadillo: An Open Source C++ Linear Algebra Library for diff --git a/package/attr/attr.mk b/package/attr/attr.mk index f7179a26d0..97f8939a59 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -9,6 +9,8 @@ ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_INSTALL_STAGING = YES ATTR_CONF_OPT = --enable-gettext=no +ATTR_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries) +ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL # While the configuration system uses autoconf, the Makefiles are # hand-written and do not use automake. Therefore, we have to hack diff --git a/package/avahi/Config.in b/package/avahi/Config.in index fd4d229edb..483d976c77 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_AVAHI # libdaemon uses fork() depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PREFER_STATIC_LIB select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Avahi is a system which facilitates service diff --git a/package/bellagio/bellagio.mk b/package/bellagio/bellagio.mk index 993015cf2b..6db753d504 100644 --- a/package/bellagio/bellagio.mk +++ b/package/bellagio/bellagio.mk @@ -11,5 +11,6 @@ BELLAGIO_AUTORECONF = YES BELLAGIO_INSTALL_STAGING = YES BELLAGIO_LICENSE = LGPLv2.1+ BELLAGIO_LICENSE_FILES = COPYING +BELLAGIO_PROVIDES = libopenmax $(eval $(autotools-package)) diff --git a/package/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch b/package/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch new file mode 100644 index 0000000000..7881646981 --- /dev/null +++ b/package/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch @@ -0,0 +1,66 @@ +From: Alan Modra <amodra@gmail.com> +Date: Fri, 20 Dec 2013 13:27:52 +0000 (+1030) +Subject: Don't segv on cie.initial_instructions[] overflow. +X-Git-Tag: gdb-7.7-release~148 +X-Git-Url: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff_plain;h=99d190fac4d2aab238cfc798dc5c28ab41456882 + +Don't segv on cie.initial_instructions[] overflow. + +Don't attempt to merge CIEs with a larger number of insns than will +fit in the buffer. + + * elf-eh-frame.c (cie_eq): Return false when initial_insn_length + is too large. + (cie_compute_hash): Don't exceed bounds of initial_instructions. + (_bfd_elf_parse_eh_frame): Always set initial_insn_length, and + save as much of insns to initial_instructions[] as will fit. +--- + +diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c +index 832a991..4b6e8ea 100644 +--- a/bfd/elf-eh-frame.c ++++ b/bfd/elf-eh-frame.c +@@ -235,6 +235,7 @@ cie_eq (const void *e1, const void *e2) + && c1->lsda_encoding == c2->lsda_encoding + && c1->fde_encoding == c2->fde_encoding + && c1->initial_insn_length == c2->initial_insn_length ++ && c1->initial_insn_length <= sizeof (c1->initial_instructions) + && memcmp (c1->initial_instructions, + c2->initial_instructions, + c1->initial_insn_length) == 0) +@@ -254,6 +255,7 @@ static hashval_t + cie_compute_hash (struct cie *c) + { + hashval_t h = 0; ++ size_t len; + h = iterative_hash_object (c->length, h); + h = iterative_hash_object (c->version, h); + h = iterative_hash (c->augmentation, strlen (c->augmentation) + 1, h); +@@ -267,7 +269,10 @@ cie_compute_hash (struct cie *c) + h = iterative_hash_object (c->lsda_encoding, h); + h = iterative_hash_object (c->fde_encoding, h); + h = iterative_hash_object (c->initial_insn_length, h); +- h = iterative_hash (c->initial_instructions, c->initial_insn_length, h); ++ len = c->initial_insn_length; ++ if (len > sizeof (c->initial_instructions)) ++ len = sizeof (c->initial_instructions); ++ h = iterative_hash (c->initial_instructions, len, h); + c->hash = h; + return h; + } +@@ -762,11 +767,10 @@ _bfd_elf_parse_eh_frame (bfd *abfd, struct bfd_link_info *info, + cie->fde_encoding = DW_EH_PE_absptr; + + initial_insn_length = end - buf; +- if (initial_insn_length <= sizeof (cie->initial_instructions)) +- { +- cie->initial_insn_length = initial_insn_length; +- memcpy (cie->initial_instructions, buf, initial_insn_length); +- } ++ cie->initial_insn_length = initial_insn_length; ++ memcpy (cie->initial_instructions, buf, ++ initial_insn_length <= sizeof (cie->initial_instructions) ++ ? initial_insn_length : sizeof (cie->initial_instructions)); + insns = buf; + buf += initial_insn_length; + ENSURE_NO_RELOCS (buf); diff --git a/package/btrfs-progs/Config.in b/package/btrfs-progs/Config.in index dcd2ec540a..a8d407be65 100644 --- a/package/btrfs-progs/Config.in +++ b/package/btrfs-progs/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_BTRFS_PROGS depends on BR2_USE_WCHAR # util-linux depends on BR2_USE_MMU # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_avr32 # toolchain issues select BR2_PACKAGE_ACL select BR2_PACKAGE_ATTR select BR2_PACKAGE_E2FSPROGS @@ -19,5 +20,6 @@ config BR2_PACKAGE_BTRFS_PROGS comment "btrfs-progs needs a toolchain w/ largefile, wchar, threads" depends on BR2_USE_MMU + depends on !BR2_avr32 depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/cairo/cairo-004-fix-nofork-any2ppm.patch b/package/cairo/cairo-004-fix-nofork-any2ppm.patch new file mode 100644 index 0000000000..16cc2e015d --- /dev/null +++ b/package/cairo/cairo-004-fix-nofork-any2ppm.patch @@ -0,0 +1,23 @@ +test: fix build of any2ppm if fork is not available. + +The test program any2ppm can run as daemon. This feature can be disabled at +compile time, if the required headers are not present. However the support for +fork() is not checked. + +This patch fixes this issue. + +Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> + +Index: cairo-1.12.10/test/any2ppm.c +=================================================================== +--- cairo-1.12.10.orig/test/any2ppm.c 2012-04-19 14:17:34.000000000 +0200 ++++ cairo-1.12.10/test/any2ppm.c 2014-04-25 11:13:30.000000000 +0200 +@@ -79,7 +79,7 @@ + + #include <errno.h> + +-#if HAVE_UNISTD_H && HAVE_FCNTL_H && HAVE_SIGNAL_H && HAVE_SYS_STAT_H && HAVE_SYS_SOCKET_H && HAVE_SYS_POLL_H && HAVE_SYS_UN_H ++#if HAVE_UNISTD_H && HAVE_FCNTL_H && HAVE_SIGNAL_H && HAVE_SYS_STAT_H && HAVE_SYS_SOCKET_H && HAVE_SYS_POLL_H && HAVE_SYS_UN_H && HAVE_FORK + #include <fcntl.h> + #include <signal.h> + #include <sys/stat.h> diff --git a/package/cairo/cairo-005-fix-gcc-49-build.patch b/package/cairo/cairo-005-fix-gcc-49-build.patch new file mode 100644 index 0000000000..112c9ea053 --- /dev/null +++ b/package/cairo/cairo-005-fix-gcc-49-build.patch @@ -0,0 +1,38 @@ +Fix build with gcc 4.9 + +cairo fails to build with gcc 4.9 due to a bad interaction of cairo +modules with the LTO mechanism. The suggested workaround is to pass +-ffat-lto-objects. See +https://bugs.freedesktop.org/show_bug.cgi?id=77060 for the upstream +bug report, and +https://bugs.archlinux.org/task/40313?project=1&openedfrom=-1+week for +the ArchLinux bug report. + +This patch passes -ffat-lto-objects when gcc understands this option, +in order to provide compatibility with gcc versions older than 4.8, +which did not provide this option, but are anyway unaffected by the +issue. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -37,6 +37,16 @@ + m4_include(build/configure.ac.pthread) dnl checks for pthreads + AC_CACHE_SAVE + ++old_cflags=$CFLAGS ++CFLAGS=-ffat-lto-objects ++AC_MSG_CHECKING([whether CC supports -ffat-lto-objects]) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], ++ [AC_MSG_RESULT([yes])] ++ [LTO_CFLAGS=-ffat-lto-objects], ++ [AC_MSG_RESULT([no])] ++) ++CFLAGS="${old_CFLAGS} ${LTO_CFLAGS}" ++ + dnl =========================================================================== + + AC_CHECK_LIB(z, compress, diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 43238cac66..789dfa7ba2 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -10,6 +10,7 @@ CAIRO_LICENSE = LGPLv2.1+ CAIRO_LICENSE_FILES = COPYING CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES +CAIRO_AUTORECONF = YES CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ glib_cv_uscore=no ac_cv_func_strtod=yes \ diff --git a/package/clapack/Config.in b/package/clapack/Config.in index ee538a40db..5e930a6958 100644 --- a/package/clapack/Config.in +++ b/package/clapack/Config.in @@ -5,6 +5,10 @@ config BR2_PACKAGE_CLAPACK # _fpu_control is used on PowerPC, but not available with # uClibc depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) + # disable clapack on blackfin, it triggers "undefined symbol" failure + # because of the "_" symbol prefix: + # http://autobuild.buildroot.net/results/a28df0ba10803e6e54c2f8160bbd8190cba4d690/ + depends on !BR2_bfin help BLAS and LAPACK C implementation (f2c'ed version of). @@ -24,5 +28,6 @@ config BR2_PACKAGE_CLAPACK_ARITH_H comment "cblas/clapack needs a toolchain w/ largefile" depends on !BR2_LARGEFILE + depends on !BR2_bfin depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) diff --git a/package/connman/Config.in b/package/connman/Config.in index ea1fb715fd..7160905a94 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_CONNMAN for managing internet connections within embedded devices running the Linux operating system. - For more information, see http://connman.net/ + For more information, see https://01.org/connman if BR2_PACKAGE_CONNMAN diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 1d83a0b623..3ae7f3e9f2 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -26,6 +26,11 @@ DIRECTFB_CONF_OPT = \ --disable-video4linux \ --disable-video4linux2 \ --without-tools + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +DIRECTFB_CONF_OPT += --disable-dynload +endif + DIRECTFB_CONFIG_SCRIPTS = directfb-config DIRECTFB_DEPENDENCIES = freetype zlib diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index 8212f3fa65..a6b83d0d1e 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -9,14 +9,13 @@ DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools DOSFSTOOLS_LICENSE = GPLv3+ DOSFSTOOLS_LICENSE_FILES = COPYING -DOSFSTOOLS_LDFLAGS = $(TARGET_LDFLAGS) # Avoid target dosfstools dependencies, no host-libiconv HOST_DOSFSTOOLS_DEPENDENCIES = ifneq ($(BR2_ENABLE_LOCALE),y) DOSFSTOOLS_DEPENDENCIES += libiconv -DOSFSTOOLS_LDFLAGS += -liconv +DOSFSTOOLS_LDLIBS += -liconv endif FATLABEL_BINARY = fatlabel @@ -24,8 +23,7 @@ FSCK_FAT_BINARY = fsck.fat MKFS_FAT_BINARY = mkfs.fat define DOSFSTOOLS_BUILD_CMDS - $(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" \ - LDFLAGS="$(DOSFSTOOLS_LDFLAGS)" -C $(@D) + $(MAKE) $(TARGET_CONFIGURE_OPTS) LDLIBS="$(DOSFSTOOLS_LDLIBS)" -C $(@D) endef DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_FATLABEL)+=$(FATLABEL_BINARY) diff --git a/package/dropbear/S50dropbear b/package/dropbear/S50dropbear index a343b9e1c0..f36165ae48 100644 --- a/package/dropbear/S50dropbear +++ b/package/dropbear/S50dropbear @@ -10,10 +10,6 @@ start() { DROPBEAR_ARGS="$DROPBEAR_ARGS -R" echo -n "Starting dropbear sshd: " - # Make sure dropbear directory exists - if [ ! -d /etc/dropbear ] ; then - mkdir -p /etc/dropbear - fi umask 077 start-stop-daemon -S -q -p /var/run/dropbear.pid \ --exec /usr/sbin/dropbear -- $DROPBEAR_ARGS diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 2ac6211988..3a391694e6 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -85,6 +85,7 @@ define DROPBEAR_INSTALL_TARGET_CMDS for f in $(DROPBEAR_TARGET_BINS); do \ ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/$$f ; \ done + mkdir -p $(TARGET_DIR)/etc/dropbear endef $(eval $(autotools-package)) diff --git a/package/duma/Config.in b/package/duma/Config.in index e9cc9b2fd7..7679e647c2 100644 --- a/package/duma/Config.in +++ b/package/duma/Config.in @@ -2,6 +2,10 @@ config BR2_PACKAGE_DUMA bool "duma" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + # By design, duma uses page mapping to isolate + # allocations. Non-MMU platforms cannot perform such + # things. + depends on BR2_USE_MMU help D.U.M.A. - Detect Unintended Memory Access. A fork of the Electric Fence library. Detects buffer overflow and @@ -17,4 +21,5 @@ config BR2_PACKAGE_DUMA_NO_LEAKDETECTION endif # BR2_PACKAGE_DUMA comment "duma needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/duma/duma.mk b/package/duma/duma.mk index d11987f4af..6e730f9766 100644 --- a/package/duma/duma.mk +++ b/package/duma/duma.mk @@ -19,6 +19,7 @@ DUMA_OPTIONS = \ # build time, is not specified in the Makefile. Force non-parallel build. define DUMA_BUILD_CMDS $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ + OS=linux \ DUMA_OPTIONS="$(DUMA_OPTIONS)" \ $(DUMA_CPP) -C $(@D) endef diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk index 2a35d293f6..98ff7eb31e 100644 --- a/package/dvb-apps/dvb-apps.mk +++ b/package/dvb-apps/dvb-apps.mk @@ -10,17 +10,15 @@ DVB_APPS_SITE_METHOD = hg DVB_APPS_LICENSE = GPLv2 GPLv2+ LGPLv2.1+ DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL -DVB_APPS_LDFLAGS = $(TARGET_LDFLAGS) - ifeq ($(BR2_ENABLE_LOCALE),) DVB_APPS_DEPENDENCIES = libiconv -DVB_APPS_LDFLAGS += -liconv +DVB_APPS_LDLIBS += -liconv endif DVB_APPS_INSTALL_STAGING = YES define DVB_APPS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" \ + $(TARGET_CONFIGURE_OPTS) LDLIBS="$(DVB_APPS_LDLIBS)" \ $(MAKE) -C $(@D) CROSS_ROOT=$(STAGING_DIR) V=1 endef diff --git a/package/ecryptfs-utils/Config.in b/package/ecryptfs-utils/Config.in index 62cf6c856a..076e1d4d7a 100644 --- a/package/ecryptfs-utils/Config.in +++ b/package/ecryptfs-utils/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS depends on BR2_LARGEFILE # libnss depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr + depends on !BR2_MIPS_NABI32 # libnss help eCryptfs is a POSIX-compliant enterprise cryptographic filesystem for Linux. It is stacked on top of any other diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in index 588c29df98..20a1aaa07c 100644 --- a/package/elfutils/Config.in +++ b/package/elfutils/Config.in @@ -1,4 +1,6 @@ comment "elfutils needs a toolchain w/ largefile, wchar" + depends on !BR2_avr32 + depends on !BR2_bfin depends on !BR2_LARGEFILE || !BR2_USE_WCHAR config BR2_PACKAGE_ELFUTILS @@ -10,6 +12,9 @@ config BR2_PACKAGE_ELFUTILS # canonicalize_file_name() not available on uClibc 0.9.31, used # only for AVR32 depends on !BR2_avr32 + # build issue caused by the _ prefix used on blackfin for + # assembly symbols + depends on !BR2_bfin help Libraries/utilities to handle ELF objects (drop in replacement for libelf). diff --git a/package/eudev/S10udev b/package/eudev/S10udev index e4d28a2323..e00aa91842 100755 --- a/package/eudev/S10udev +++ b/package/eudev/S10udev @@ -27,8 +27,8 @@ test -r $UDEV_CONFIG || exit 6 case "$1" in start) - echo -n "Populating ${udev_root:-/dev} using udev: " - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug + printf "Populating ${udev_root:-/dev} using udev: " + printf '\000\000\000\000' > /proc/sys/kernel/hotplug $UDEV_BIN -d || (echo "FAIL" && exit 1) udevadm trigger echo "done" diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 32713fad32..fc9c7d92c8 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -25,6 +25,7 @@ EUDEV_CONF_OPT = \ --enable-libkmod EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod +EUDEV_PROVIDES = udev ifeq ($(BR2_PACKAGE_EUDEV_RULES_GEN),y) EUDEV_CONF_OPT += --enable-rule_generator diff --git a/package/exim/exim.mk b/package/exim/exim.mk index ca9c8a755a..0f9c6af784 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIM_VERSION = 4.82 +EXIM_VERSION = 4.82.1 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.bz2 EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPLv2+ @@ -49,15 +49,22 @@ define EXIM_CONFIGURE_CMDS $(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS)) endef +# exim needs a bit of love to build statically +ifeq ($(BR2_PREFER_STATIC_LIB),y) +EXIM_STATIC_FLAGS = LFLAGS="-pthread --static" +endif + # "The -j (parallel) flag must not be used with make" # (http://www.exim.org/exim-html-current/doc/html/spec_html/ch04.html) define EXIM_BUILD_CMDS - build=br $(MAKE1) -C $(@D) + build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) endef +# Need to replicate the LFLAGS in install, as exim still wants to build +# something when installing... define EXIM_INSTALL_TARGET_CMDS DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \ - $(MAKE1) -C $(@D) install + $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) install chmod u+s $(TARGET_DIR)/usr/sbin/exim endef diff --git a/package/fbgrab/fbgrab-01-fix-static-build.patch b/package/fbgrab/fbgrab-01-fix-static-build.patch new file mode 100644 index 0000000000..fe5ae2cab1 --- /dev/null +++ b/package/fbgrab/fbgrab-01-fix-static-build.patch @@ -0,0 +1,21 @@ +Fix static build + +fbgrab links against libpng, which depends on libm. For shared library +builds, there is nothing special to do about this, but for static +library builds, it is necessary to pass -lm when linking fbgrab. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -12,7 +12,7 @@ + all: fbgrab fbgrab.1.gz + + fbgrab: fbgrab.c +- $(CC) -g -Wall $(CFLAGS) $(LDFLAGS) $< -lpng -lz -o $@ ++ $(CC) -g -Wall $(CFLAGS) $(LDFLAGS) $< -lpng -lz -lm -o $@ + + fbgrab.1.gz: fbgrab.1.man + $(GZIP) $(GZIPFLAGS) $< > $@ diff --git a/package/fio/Config.in b/package/fio/Config.in index be99f25ba7..3f0599d7d5 100644 --- a/package/fio/Config.in +++ b/package/fio/Config.in @@ -12,6 +12,9 @@ config BR2_PACKAGE_FIO depends on !BR2_TOOLCHAIN_EXTERNAL_UCLIBC && \ !BR2_UCLIBC_VERSION_0_9_31 && \ !BR2_UCLIBC_VERSION_0_9_32 + # fio uses fallocate() which becomes fallocate64() while compiling + # with BR2_LARGEFILE but fallocate64() is not available on nios2 + depends on !BR2_nios2 help fio is an I/O tool meant to be used both for benchmark and stress/hardware verification. @@ -20,3 +23,4 @@ config BR2_PACKAGE_FIO comment "fio needs a toolchain w/ largefile, threads" depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_nios2 diff --git a/package/flann/Config.in b/package/flann/Config.in index 4b0b5a8cf3..6185b1292d 100644 --- a/package/flann/Config.in +++ b/package/flann/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_FLANN bool "flann" depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_PREFER_STATIC_LIB help FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional spaces. It contains a @@ -20,5 +21,5 @@ config BR2_PACKAGE_FLANN_EXAMPLES endif -comment "flann needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "flann needs a toolchain w/ C++, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_PREFER_STATIC_LIB diff --git a/package/flite/flite-0002-fix-alsa-static.patch b/package/flite/flite-0002-fix-alsa-static.patch new file mode 100644 index 0000000000..7ed4899cc4 --- /dev/null +++ b/package/flite/flite-0002-fix-alsa-static.patch @@ -0,0 +1,19 @@ +Use pkg-config to determine alsa link flags. This fixes static linking. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> + +diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in +--- flite-1.4-release.orig/configure.in 2009-08-14 23:46:38.000000000 +0300 ++++ flite-1.4-release/configure.in 2014-04-30 18:52:33.253297236 +0300 +@@ -275,7 +275,10 @@ + #endif], + [AUDIODRIVER="alsa" + AUDIODEFS=-DCST_AUDIO_ALSA +- AUDIOLIBS=-lasound]) ++ AUDIOLIBS=`pkg-config --libs alsa` ++ if test "$shared" = false; then ++ AUDIOLIBS=`pkg-config --libs --static alsa` ++ fi]) + AC_CHECK_HEADER(mmsystem.h, + [AUDIODRIVER="wince" + AUDIODEFS=-DCST_AUDIO_WINCE diff --git a/package/flite/flite.mk b/package/flite/flite.mk index 08d2ce1622..38aaebf517 100644 --- a/package/flite/flite.mk +++ b/package/flite/flite.mk @@ -11,6 +11,9 @@ FLITE_LICENSE = BSD-4c FLITE_LICENSE_FILES = COPYING FLITE_INSTALL_STAGING = YES +# Patching configure.in +FLITE_AUTORECONF = YES +FLITE_DEPENDENCIES = host-pkgconf # Sadly, Flite does not support parallel build, especially when building its # shared libraries. diff --git a/package/fluxbox/Config.in b/package/fluxbox/Config.in index cb4d76feb3..ab479a9f69 100644 --- a/package/fluxbox/Config.in +++ b/package/fluxbox/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FLUXBOX bool "fluxbox" depends on BR2_PACKAGE_XORG7 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_XLIB_LIBX11 # Runtime dependency, needed by startup script select BR2_PACKAGE_XAPP_XMODMAP @@ -11,4 +12,5 @@ config BR2_PACKAGE_FLUXBOX http://fluxbox.org comment "fluxbox needs a toolchain w/ C++" + depends on BR2_USE_MMU depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk index e799fd2a5e..49a8287792 100644 --- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk @@ -23,6 +23,8 @@ GPU_VIV_BIN_MX6Q_LICENSE = Freescale Semiconductor Software License Agreement # for which a separate license is needed... GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO +GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles + # DirectFB is not supported (wrong version) ifeq ($(BR2_PACKAGE_XORG7),y) GPU_VIV_BIN_MX6Q_DEPENDENCIES = xlib_libXdamage xlib_libXext diff --git a/package/gdb/6.6a/100-uclibc-conf.patch b/package/gdb/6.6a/100-uclibc-conf.patch deleted file mode 100644 index a790b6f0f1..0000000000 --- a/package/gdb/6.6a/100-uclibc-conf.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -rNdup gdb-6.6.orig/bfd/configure gdb-6.6/bfd/configure ---- gdb-6.6.orig/bfd/configure 2006-10-25 08:49:20.000000000 +0200 -+++ gdb-6.6/bfd/configure 2007-05-14 10:35:50.000000000 +0200 -@@ -3579,6 +3579,11 @@ linux-gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -diff -rNdup gdb-6.6.orig/libtool.m4 gdb-6.6/libtool.m4 ---- gdb-6.6.orig/libtool.m4 2005-12-27 17:37:57.000000000 +0100 -+++ gdb-6.6/libtool.m4 2007-05-14 10:35:50.000000000 +0200 -@@ -751,6 +751,11 @@ netbsd* | knetbsd*-gnu) - fi - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - newsos6) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] - lt_cv_file_magic_cmd=/usr/bin/file -diff -rNdup gdb-6.6.orig/ltconfig gdb-6.6/ltconfig ---- gdb-6.6.orig/ltconfig 2006-07-04 22:31:03.000000000 +0200 -+++ gdb-6.6/ltconfig 2007-05-14 10:35:50.000000000 +0200 -@@ -602,7 +602,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- - - # Transform linux* to *-*-linux-gnu*, to support old configure scripts. - case $host_os in --linux-gnu*) ;; -+linux-gnu*|linux-uclibc*) ;; - linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` - esac - -@@ -1270,6 +1270,24 @@ linux-gnu*) - dynamic_linker='GNU/Linux ld.so' - ;; - -+linux-uclibc*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ soname_spec='${libname}${release}.so$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ # Note: copied from linux-gnu, and may not be appropriate. -+ hardcode_into_libs=yes -+ # Assume using the uClibc dynamic linker. -+ dynamic_linker="uClibc ld.so" -+ ;; -+ - netbsd*) - need_lib_prefix=no - need_version=no -diff -rNdup gdb-6.6.orig/opcodes/configure gdb-6.6/opcodes/configure ---- gdb-6.6.orig/opcodes/configure 2006-10-25 08:49:20.000000000 +0200 -+++ gdb-6.6/opcodes/configure 2007-05-14 10:35:50.000000000 +0200 -@@ -3590,6 +3590,11 @@ netbsd* | knetbsd*-gnu) - fi - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - newsos6) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file diff --git a/package/gdb/6.6a/600-fix-compile-flag-mismatch.patch b/package/gdb/6.6a/600-fix-compile-flag-mismatch.patch deleted file mode 100644 index 60f0ace653..0000000000 --- a/package/gdb/6.6a/600-fix-compile-flag-mismatch.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -rduNp gdb-6.6-100/Makefile.in gdb-6.6/Makefile.in ---- gdb-6.6-100/Makefile.in 2006-12-18 08:21:19.000000000 +0100 -+++ gdb-6.6/Makefile.in 2007-05-14 10:54:29.000000000 +0200 -@@ -331,7 +331,7 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_ - # CFLAGS will be just -g. We want to ensure that TARGET libraries - # (which we know are built with gcc) are built with optimizations so - # prepend -O2 when setting CFLAGS_FOR_TARGET. --CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) -+CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)) - SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) -diff -rduNp gdb-6.6-100/Makefile.tpl gdb-6.6/Makefile.tpl ---- gdb-6.6-100/Makefile.tpl 2006-11-15 00:26:39.000000000 +0100 -+++ gdb-6.6/Makefile.tpl 2007-05-14 10:54:29.000000000 +0200 -@@ -334,7 +334,7 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_ - # CFLAGS will be just -g. We want to ensure that TARGET libraries - # (which we know are built with gcc) are built with optimizations so - # prepend -O2 when setting CFLAGS_FOR_TARGET. --CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) -+CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)) - SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) -diff -rduNp gdb-6.6-100/gdb/configure gdb-6.6/gdb/configure ---- gdb-6.6-100/gdb/configure 2006-12-17 16:38:59.000000000 +0100 -+++ gdb-6.6/gdb/configure 2007-05-14 10:55:41.000000000 +0200 -@@ -272,7 +272,7 @@ PACKAGE_STRING= - PACKAGE_BUGREPORT= - - ac_unique_file="main.c" --ac_subdirs_all="$ac_subdirs_all doc testsuite" -+ac_subdirs_all="$ac_subdirs_all doc" - # Factoring default headers for most tests. - ac_includes_default="\ - #include <stdio.h> -@@ -3055,7 +3055,7 @@ _ACEOF - - - --subdirs="$subdirs doc testsuite" -+subdirs="$subdirs doc" - - - # Provide defaults for some variables set by the per-host and per-target -diff -rduNp gdb-6.6-100/gdb/gdbserver/configure gdb-6.6/gdb/gdbserver/configure ---- gdb-6.6-100/gdb/gdbserver/configure 2006-11-22 01:10:19.000000000 +0100 -+++ gdb-6.6/gdb/gdbserver/configure 2007-05-14 10:54:29.000000000 +0200 -@@ -1239,7 +1239,7 @@ echo "$as_me: error: \`$ac_var' was not - ac_cache_corrupted=: ;; - ,);; - *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -+ if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -diff -rduNp gdb-6.6-100/gdb/testsuite/configure gdb-6.6/gdb/testsuite/configure ---- gdb-6.6-100/gdb/testsuite/configure 2006-06-21 15:57:21.000000000 +0200 -+++ gdb-6.6/gdb/testsuite/configure 2007-05-14 10:54:29.000000000 +0200 -@@ -1248,7 +1248,7 @@ echo "$as_me: error: \`$ac_var' was not - ac_cache_corrupted=: ;; - ,);; - *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -+ if test "`echo $ac_old_val" != "`echo $ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 diff --git a/package/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch b/package/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch deleted file mode 100644 index 65c4b908d7..0000000000 --- a/package/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch +++ /dev/null @@ -1,238 +0,0 @@ ---- gdb-6.6/gdb/gdbserver/configure.srv -+++ gdb-6.6/gdb/gdbserver/configure.srv -@@ -23,6 +23,11 @@ case "${target}" in - srv_linux_usrregs=yes - srv_linux_thread_db=yes - ;; -+ bfin-*-*) srv_regobj=reg-bfin.o -+ srv_tgtobj="linux-low.o linux-bfin-low.o" -+ srv_linux_usrregs=yes -+ srv_linux_thread_db=yes -+ ;; - crisv32-*-linux*) srv_regobj=reg-crisv32.o - srv_tgtobj="linux-low.o linux-crisv32-low.o" - srv_linux_regsets=yes ---- gdb-6.6/gdb/gdbserver/linux-bfin-low.c -+++ gdb-6.6/gdb/gdbserver/linux-bfin-low.c -@@ -0,0 +1,101 @@ -+/* GNU/Linux/BFIN specific low level interface, for the remote server for GDB. -+ -+ Copyright (C) 2005 Free Software Foundation, Inc. -+ Contributed by Analog Devices. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ -+ -+#include "server.h" -+#include "linux-low.h" -+#include <asm/ptrace.h> -+ -+static int bfin_regmap[] = -+{ -+ PT_R0, PT_R1, PT_R2, PT_R3, PT_R4, PT_R5, PT_R6, PT_R7, -+ PT_P0, PT_P1, PT_P2, PT_P3, PT_P4, PT_P5, PT_USP, PT_FP, -+ PT_I0, PT_I1, PT_I2, PT_I3, PT_M0, PT_M1, PT_M2, PT_M3, -+ PT_B0, PT_B1, PT_B2, PT_B3, PT_L0, PT_L1, PT_L2, PT_L3, -+ PT_A0X, PT_A0W, PT_A1X, PT_A1W, PT_ASTAT, PT_RETS, -+ PT_LC0, PT_LT0, PT_LB0, PT_LC1, PT_LT1, PT_LB1, -+ -1 /* PT_CYCLES */, -1 /* PT_CYCLES2 */, -+ -1 /* PT_USP */, PT_SEQSTAT, PT_SYSCFG, PT_PC, PT_RETX, PT_RETN, PT_RETE, -+ PT_PC, -1 /* PT_CC */, PT_TEXT_ADDR, PT_TEXT_END_ADDR, PT_DATA_ADDR, -+ PT_FDPIC_EXEC, PT_FDPIC_INTERP, -+ PT_IPEND -+}; -+ -+#define bfin_num_regs (sizeof(bfin_regmap) / sizeof(bfin_regmap[0])) -+ -+static int -+bfin_cannot_store_register (int regno) -+{ -+ return (regno >= bfin_num_regs); -+} -+ -+static int -+bfin_cannot_fetch_register (int regno) -+{ -+ return (regno >= bfin_num_regs); -+} -+ -+static CORE_ADDR -+bfin_get_pc () -+{ -+ unsigned long pc; -+ collect_register_by_name ("pc", &pc); -+ return pc; -+} -+ -+static void -+bfin_set_pc (CORE_ADDR pc) -+{ -+ unsigned long newpc = pc; -+ supply_register_by_name ("pc", &newpc); -+} -+ -+#define bfin_breakpoint_len 2 -+static const unsigned char bfin_breakpoint[bfin_breakpoint_len]={0xa1, 0x00}; -+ -+static int -+bfin_breakpoint_at (CORE_ADDR where) -+{ -+ unsigned char insn[bfin_breakpoint_len]; -+ -+ read_inferior_memory(where, insn, bfin_breakpoint_len); -+ if (insn[0] == bfin_breakpoint[0] -+ && insn[1] == bfin_breakpoint[1]) -+ return 1; -+ -+ /* If necessary, recognize more trap instructions here. GDB only uses the -+ one. */ -+ return 0; -+} -+ -+struct linux_target_ops the_low_target = { -+ bfin_num_regs, -+ bfin_regmap, -+ bfin_cannot_fetch_register, -+ bfin_cannot_store_register, -+ bfin_get_pc, -+ bfin_set_pc, -+ bfin_breakpoint, -+ bfin_breakpoint_len, -+ 0, -+ 2, -+ bfin_breakpoint_at, -+}; ---- gdb-6.6/gdb/gdbserver/linux-low.c -+++ gdb-6.6/gdb/gdbserver/linux-low.c -@@ -1592,6 +1592,10 @@ linux_stopped_data_address (void) - #define PT_TEXT_ADDR 49*4 - #define PT_DATA_ADDR 50*4 - #define PT_TEXT_END_ADDR 51*4 -+#elif defined(BFIN) -+#define PT_TEXT_ADDR 220 -+#define PT_TEXT_END_ADDR 224 -+#define PT_DATA_ADDR 228 - #endif - - /* Under uClinux, programs are loaded at non-zero offsets, which we need ---- gdb-6.6/gdb/gdbserver/Makefile.in -+++ gdb-6.6/gdb/gdbserver/Makefile.in -@@ -119,9 +119,9 @@ SFILES= $(srcdir)/gdbreplay.c $(srcdir)/ - $(srcdir)/mem-break.c $(srcdir)/proc-service.c $(srcdir)/regcache.c \ - $(srcdir)/remote-utils.c $(srcdir)/server.c $(srcdir)/target.c \ - $(srcdir)/thread-db.c $(srcdir)/utils.c \ -- $(srcdir)/linux-arm-low.c $(srcdir)/linux-cris-low.c \ -- $(srcdir)/linux-crisv32-low.c $(srcdir)/linux-i386-low.c \ -- $(srcdir)/i387-fp.c \ -+ $(srcdir)/linux-arm-low.c $(srcdir)/linux-bfin-low.c \ -+ $(srcdir)/linux-cris-low.c $(srcdir)/linux-crisv32-low.c \ -+ $(srcdir)/linux-i386-low.c $(srcdir)/i387-fp.c \ - $(srcdir)/linux-ia64-low.c $(srcdir)/linux-low.c \ - $(srcdir)/linux-m32r-low.c \ - $(srcdir)/linux-m68k-low.c $(srcdir)/linux-mips-low.c \ -@@ -207,6 +207,7 @@ clean: - rm -f reg-arm.c reg-i386.c reg-ia64.c reg-m32r.c reg-m68k.c reg-mips.c - rm -f reg-ppc.c reg-sh.c reg-spu.c reg-x86-64.c reg-i386-linux.c - rm -f reg-cris.c reg-crisv32.c reg-x86-64-linux.c -+ rm -f reg-bfin.c - - maintainer-clean realclean distclean: clean - rm -f nm.h tm.h xm.h config.status config.h stamp-h config.log -@@ -272,6 +273,7 @@ linux-low.o: linux-low.c $(linux_low_h) - - linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h) \ - $(gdb_proc_service_h) -+linux-bfin-low.o: linux-bfin-low.c $(linux_low_h) $(server_h) - linux-cris-low.o: linux-cris-low.c $(linux_low_h) $(server_h) - linux-crisv32-low.o: linux-crisv32-low.c $(linux_low_h) $(server_h) - linux-i386-low.o: linux-i386-low.c $(linux_low_h) $(server_h) \ -@@ -294,6 +297,9 @@ spu-low.o: spu-low.c $(server_h) - reg-arm.o : reg-arm.c $(regdef_h) - reg-arm.c : $(srcdir)/../regformats/reg-arm.dat $(regdat_sh) - sh $(regdat_sh) $(srcdir)/../regformats/reg-arm.dat reg-arm.c -+reg-bfin.o : reg-bfin.c $(regdef_h) -+reg-bfin.c : $(srcdir)/../regformats/reg-bfin.dat $(regdat_sh) -+ sh $(regdat_sh) $(srcdir)/../regformats/reg-bfin.dat reg-bfin.c - reg-cris.o : reg-cris.c $(regdef_h) - reg-cris.c : $(srcdir)/../regformats/reg-cris.dat $(regdat_sh) - sh $(regdat_sh) $(srcdir)/../regformats/reg-cris.dat reg-cris.c ---- gdb-6.6/gdb/regformats/reg-bfin.dat -+++ gdb-6.6/gdb/regformats/reg-bfin.dat -@@ -0,0 +1,63 @@ -+name:bfin -+expedite:pc,sp,fp -+32:r0 -+32:r1 -+32:r2 -+32:r3 -+32:r4 -+32:r5 -+32:r6 -+32:r7 -+32:p0 -+32:p1 -+32:p2 -+32:p3 -+32:p4 -+32:p5 -+32:sp -+32:fp -+32:i0 -+32:i1 -+32:i2 -+32:i3 -+32:m0 -+32:m1 -+32:m2 -+32:m3 -+32:b0 -+32:b1 -+32:b2 -+32:b3 -+32:l0 -+32:l1 -+32:l2 -+32:l3 -+32:a0x -+32:a0w -+32:a1x -+32:a1w -+32:astat -+32:rets -+32:lc0 -+32:lt0 -+32:lb0 -+32:lc1 -+32:lt1 -+32:lb1 -+32:cycles -+32:cycles2 -+32:usp -+32:seqstat -+32:syscfg -+32:reti -+32:retx -+32:retn -+32:rete -+32:pc -+32:cc -+32:text_addr -+32:text_end_addr -+32:data_addr -+32:fdpic_exec -+32:fdpic_interp -+32:ipend diff --git a/package/gdb/7.4.1/gdb-100-xtensa-fix-linux-ptrace-includes.patch b/package/gdb/7.4.1/gdb-100-xtensa-fix-linux-ptrace-includes.patch new file mode 100644 index 0000000000..3b391d0f71 --- /dev/null +++ b/package/gdb/7.4.1/gdb-100-xtensa-fix-linux-ptrace-includes.patch @@ -0,0 +1,60 @@ +From e671835b7afc90b3ff201b79f07a6fb67797bc5c Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Mon, 20 Jan 2014 09:53:12 +0200 +Subject: [PATCH] gdb: xtensa: fix linux ptrace includes + +Currently, xtensa code using the Linux ptrace interface only include +sys/ptrace.h. This file comes from the C library (glibc and uClibc, +at least), and includes a declaration of the ptrace() functions, along +with some cross architecture constants that are mostly copied from the +file located at include/uapi/linux/ptrace.h in recent Linux kernels. + +For xtensa specific constants like PTRACE_GETXTREGS and +PTRACE_SETXTREGS the asm/ptrace.h include from the Linux kernel UAPI +is needed. The code in gdbserver xtensa specific part doesn't call +ptrace() directly, so we can remove the unneeded sys/ptrace.h include. +The gdb xtensa specific code needs both headers, since it calls +ptrace(). + +gdb/ + * xtensa-linux-nat.c: Include asm/ptrace.h. + +gdb/gdbserver/ + * linux-xtensa-low.c: Include asm/ptrace.h instead of + sys/ptrace.h. +--- +Backported from: e671835b7afc90b3ff201b79f07a6fb67797bc5c +Changes to Changelog files are dropped. + + gdb/gdbserver/linux-xtensa-low.c | 2 +- + gdb/xtensa-linux-nat.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c +index 7db97a9..479b65b 100644 +--- a/gdb/gdbserver/linux-xtensa-low.c ++++ b/gdb/gdbserver/linux-xtensa-low.c +@@ -24,7 +24,7 @@ + void init_registers_xtensa (void); + extern const struct target_desc *tdesc_xtensa; + +-#include <sys/ptrace.h> ++#include <asm/ptrace.h> + #include <xtensa-config.h> + + #include "xtensa-xtregs.c" +diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c +index 2372e79..9340c62 100644 +--- a/gdb/xtensa-linux-nat.c ++++ b/gdb/xtensa-linux-nat.c +@@ -36,6 +36,7 @@ + #include <fcntl.h> + #include <sys/procfs.h> + #include <sys/ptrace.h> ++#include <asm/ptrace.h> + + #include "gregset.h" + #include "xtensa-tdep.h" +-- +1.8.1.4 + diff --git a/package/gdb/7.4.1/gdb-101-xtensa-fix-on-64-bit-hosts.patch b/package/gdb/7.4.1/gdb-101-xtensa-fix-on-64-bit-hosts.patch new file mode 100644 index 0000000000..b5f5bdf76f --- /dev/null +++ b/package/gdb/7.4.1/gdb-101-xtensa-fix-on-64-bit-hosts.patch @@ -0,0 +1,42 @@ +From 54bff650843cacd3c17a0afdb0fe32e15e1b65b0 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Wed, 22 Jan 2014 15:02:29 +0200 +Subject: [PATCH] gdb: xtensa: fix on 64-bit hosts + +On 64-bit hosts unsigned long is 64 bit. Use uint32_t instead. + +gdb/ +2014-01-22 Baruch Siach <baruch@tkos.co.il> + + * xtensa-tdep.h (xtensa_elf_greg_t): Change type to uint32_t. +--- +Backported from: 54bff650843cacd3c17a0afdb0fe32e15e1b65b0 +Changes to Changelog files are dropped and #include <stdint.h> is added. + + gdb/xtensa-tdep.h | 3 +- + 1 file changed, 2 insertion(+), 1 deletion(-) + +diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h +index 968b9d2..d7ba562 100644 +--- a/gdb/xtensa-tdep.h ++++ b/gdb/xtensa-tdep.h +@@ -17,6 +17,7 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + ++#include <stdint.h> + + /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION + whenever the "tdep" structure changes in an incompatible way. */ +@@ -84,7 +84,7 @@ typedef enum + /* Xtensa ELF core file register set representation ('.reg' section). + Copied from target-side ELF header <xtensa/elf.h>. */ + +-typedef unsigned long xtensa_elf_greg_t; ++typedef uint32_t xtensa_elf_greg_t; + + typedef struct + { +-- +1.8.1.4 + diff --git a/package/gdb/7.4.1/xtensa-asm-ptrace-h.patch b/package/gdb/7.4.1/xtensa-asm-ptrace-h.patch deleted file mode 100644 index 3d1b07c99c..0000000000 --- a/package/gdb/7.4.1/xtensa-asm-ptrace-h.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gdb-7.4.1/gdb/xtensa-linux-nat.c.orig 2012-10-19 16:23:06.908165323 -0700 -+++ gdb-7.4.1/gdb/xtensa-linux-nat.c 2012-10-19 16:35:30.792134876 -0700 -@@ -36,7 +36,7 @@ - #include "gdb_wait.h" - #include <fcntl.h> - #include <sys/procfs.h> --#include <sys/ptrace.h> -+#include <asm/ptrace.h> - - #include "gregset.h" - #include "xtensa-tdep.h" ---- gdb-7.4.1/gdb/gdbserver/linux-xtensa-low.c.orig 2012-10-19 16:24:06.260162894 -0700 -+++ gdb-7.4.1/gdb/gdbserver/linux-xtensa-low.c 2012-10-19 16:36:07.920133357 -0700 -@@ -23,7 +23,7 @@ - /* Defined in auto-generated file reg-xtensa.c. */ - void init_registers_xtensa (void); - --#include <sys/ptrace.h> -+#include <asm/ptrace.h> - #include <xtensa-config.h> - - #include "xtensa-xtregs.c" diff --git a/package/gdb/7.4.1/xtensa-gdb-regsize.patch b/package/gdb/7.4.1/xtensa-gdb-regsize.patch deleted file mode 100644 index e10bb8f3ee..0000000000 --- a/package/gdb/7.4.1/xtensa-gdb-regsize.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gdb-7.4.1/gdb/xtensa-tdep.h.orig 2012-10-30 11:40:23.546448594 -0700 -+++ gdb-7.4.1/gdb/xtensa-tdep.h 2012-10-30 11:41:43.078445337 -0700 -@@ -17,6 +17,7 @@ - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#include <stdint.h> - - /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION - whenever the "tdep" structure changes in an incompatible way. */ -@@ -84,7 +85,7 @@ - /* Xtensa ELF core file register set representation ('.reg' section). - Copied from target-side ELF header <xtensa/elf.h>. */ - --typedef unsigned long xtensa_elf_greg_t; -+typedef uint32_t xtensa_elf_greg_t; - - typedef struct - { diff --git a/package/gdb/7.5.1/gdb-100-xtensa-fix-linux-ptrace-includes.patch b/package/gdb/7.5.1/gdb-100-xtensa-fix-linux-ptrace-includes.patch new file mode 100644 index 0000000000..3b391d0f71 --- /dev/null +++ b/package/gdb/7.5.1/gdb-100-xtensa-fix-linux-ptrace-includes.patch @@ -0,0 +1,60 @@ +From e671835b7afc90b3ff201b79f07a6fb67797bc5c Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Mon, 20 Jan 2014 09:53:12 +0200 +Subject: [PATCH] gdb: xtensa: fix linux ptrace includes + +Currently, xtensa code using the Linux ptrace interface only include +sys/ptrace.h. This file comes from the C library (glibc and uClibc, +at least), and includes a declaration of the ptrace() functions, along +with some cross architecture constants that are mostly copied from the +file located at include/uapi/linux/ptrace.h in recent Linux kernels. + +For xtensa specific constants like PTRACE_GETXTREGS and +PTRACE_SETXTREGS the asm/ptrace.h include from the Linux kernel UAPI +is needed. The code in gdbserver xtensa specific part doesn't call +ptrace() directly, so we can remove the unneeded sys/ptrace.h include. +The gdb xtensa specific code needs both headers, since it calls +ptrace(). + +gdb/ + * xtensa-linux-nat.c: Include asm/ptrace.h. + +gdb/gdbserver/ + * linux-xtensa-low.c: Include asm/ptrace.h instead of + sys/ptrace.h. +--- +Backported from: e671835b7afc90b3ff201b79f07a6fb67797bc5c +Changes to Changelog files are dropped. + + gdb/gdbserver/linux-xtensa-low.c | 2 +- + gdb/xtensa-linux-nat.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c +index 7db97a9..479b65b 100644 +--- a/gdb/gdbserver/linux-xtensa-low.c ++++ b/gdb/gdbserver/linux-xtensa-low.c +@@ -24,7 +24,7 @@ + void init_registers_xtensa (void); + extern const struct target_desc *tdesc_xtensa; + +-#include <sys/ptrace.h> ++#include <asm/ptrace.h> + #include <xtensa-config.h> + + #include "xtensa-xtregs.c" +diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c +index 2372e79..9340c62 100644 +--- a/gdb/xtensa-linux-nat.c ++++ b/gdb/xtensa-linux-nat.c +@@ -36,6 +36,7 @@ + #include <fcntl.h> + #include <sys/procfs.h> + #include <sys/ptrace.h> ++#include <asm/ptrace.h> + + #include "gregset.h" + #include "xtensa-tdep.h" +-- +1.8.1.4 + diff --git a/package/gdb/7.5.1/gdb-101-xtensa-fix-on-64-bit-hosts.patch b/package/gdb/7.5.1/gdb-101-xtensa-fix-on-64-bit-hosts.patch new file mode 100644 index 0000000000..b5f5bdf76f --- /dev/null +++ b/package/gdb/7.5.1/gdb-101-xtensa-fix-on-64-bit-hosts.patch @@ -0,0 +1,42 @@ +From 54bff650843cacd3c17a0afdb0fe32e15e1b65b0 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Wed, 22 Jan 2014 15:02:29 +0200 +Subject: [PATCH] gdb: xtensa: fix on 64-bit hosts + +On 64-bit hosts unsigned long is 64 bit. Use uint32_t instead. + +gdb/ +2014-01-22 Baruch Siach <baruch@tkos.co.il> + + * xtensa-tdep.h (xtensa_elf_greg_t): Change type to uint32_t. +--- +Backported from: 54bff650843cacd3c17a0afdb0fe32e15e1b65b0 +Changes to Changelog files are dropped and #include <stdint.h> is added. + + gdb/xtensa-tdep.h | 3 +- + 1 file changed, 2 insertion(+), 1 deletion(-) + +diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h +index 968b9d2..d7ba562 100644 +--- a/gdb/xtensa-tdep.h ++++ b/gdb/xtensa-tdep.h +@@ -17,6 +17,7 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + ++#include <stdint.h> + + /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION + whenever the "tdep" structure changes in an incompatible way. */ +@@ -84,7 +84,7 @@ typedef enum + /* Xtensa ELF core file register set representation ('.reg' section). + Copied from target-side ELF header <xtensa/elf.h>. */ + +-typedef unsigned long xtensa_elf_greg_t; ++typedef uint32_t xtensa_elf_greg_t; + + typedef struct + { +-- +1.8.1.4 + diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 16a72910a1..d5954f236d 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -17,36 +17,30 @@ choice prompt "GDB debugger Version" depends on !BR2_arc depends on !BR2_microblaze - default BR2_GDB_VERSION_6_6 if BR2_bfin default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32 default BR2_GDB_VERSION_7_7 if BR2_powerpc64le default BR2_GDB_VERSION_7_6 help Select the version of gdb you wish to use. - config BR2_GDB_VERSION_6_6 - bool "gdb 6.6" - depends on BR2_bfin - config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 depends on BR2_avr32 bool "gdb 6.7.1-avr32-2.1.5" config BR2_GDB_VERSION_7_4 bool "gdb 7.4.x" - depends on !BR2_bfin && !BR2_powerpc64le + depends on !BR2_powerpc64le config BR2_GDB_VERSION_7_5 bool "gdb 7.5.x" - depends on !BR2_bfin && !BR2_powerpc64le + depends on !BR2_powerpc64le config BR2_GDB_VERSION_7_6 bool "gdb 7.6.x" - depends on !BR2_bfin && !BR2_powerpc64le + depends on !BR2_powerpc64le config BR2_GDB_VERSION_7_7 bool "gdb 7.7.x" - depends on !BR2_bfin endchoice @@ -56,8 +50,6 @@ endif config BR2_GDB_VERSION string depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB - default "6.6a" if BR2_GDB_VERSION_6_6 || \ - (!BR2_PACKAGE_HOST_GDB && BR2_bfin) default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 || \ (!BR2_PACKAGE_HOST_GDB && BR2_avr32) default "arc-4.8-R3" if BR2_arc diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 678c17cfd9..6640d2c280 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -51,7 +51,6 @@ 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 \ @@ -116,6 +115,10 @@ HOST_GDB_CONF_OPT = \ ifeq ($(GDB_FROM_GIT),y) HOST_GDB_DEPENDENCIES += host-texinfo +else +# don't generate documentation +GDB_CONF_ENV += ac_cv_prog_MAKEINFO=missing +HOST_GDB_CONF_ENV += ac_cv_prog_MAKEINFO=missing endif # legacy $arch-linux-gdb symlink diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 8b2af5724b..cade3b3517 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.2 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).14 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).15 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = GPLv3+ LGPLv2.1+ diff --git a/package/gpm/gpm.mk b/package/gpm/gpm.mk index 477c54a55e..d37b4edcc3 100644 --- a/package/gpm/gpm.mk +++ b/package/gpm/gpm.mk @@ -17,6 +17,14 @@ GPM_DEPENDENCIES = host-bison # built. CPPFLAGS is used to pass the right include path to dependency rules. GPM_CONF_ENV = CPPFLAGS="$(TARGET_CPPFLAGS) -I$(@D)/src/headers/" +# For some reason, Microblaze gcc does not define __ELF__, which gpm +# configure script uses to determine whether the architecture uses ELF +# binaries and therefore can build shared libraries. We fix this by +# telling GPM that ELF is used on Microblaze. +ifeq ($(BR2_microblaze),y) +GPM_CONF_ENV += itz_cv_sys_elf=yes +endif + # gpm and ncurses have a circular dependency. As gpm function GPM_Wgetch() # (requiring ncurses) is not recommended for use by ncurses people themselves # and as it's better to have gpm support in ncurses that the contrary, we force diff --git a/package/gstreamer/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in index 9c2b884dea..3ec93cfa10 100644 --- a/package/gstreamer/gst-plugins-good/Config.in +++ b/package/gstreamer/gst-plugins-good/Config.in @@ -207,6 +207,7 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio depends on BR2_LARGEFILE # pulseaudio -> libsndfile + depends on BR2_USE_MMU # pulseaudio select BR2_PACKAGE_PULSEAUDIO bool "pulseaudio" diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index 9fd6114f3b..7159c5a0a3 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -303,6 +303,7 @@ comment "gdkpixbuf needs a toolchain w/ wchar, threads" config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio depends on BR2_LARGEFILE # pulseaudio -> libsndfile + depends on BR2_USE_MMU # pulseaudio select BR2_PACKAGE_PULSEAUDIO bool "pulseaudio" help diff --git a/package/httping/httping.mk b/package/httping/httping.mk index 610cecb9e3..ca636c0d21 100644 --- a/package/httping/httping.mk +++ b/package/httping/httping.mk @@ -9,9 +9,12 @@ HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz HTTPING_SITE = http://www.vanheusden.com/httping HTTPING_LICENSE = GPLv2 HTTPING_LICENSE_FILES = license.txt -HTTPING_LDFLAGS = $(if $(BR2_NEEDS_GETTEXT),-lintl) $(TARGET_LDFLAGS) +HTTPING_LDFLAGS = $(TARGET_LDFLAGS) \ + $(if $(BR2_NEEDS_GETTEXT),-lintl) \ + $(if $(BR2_PACKAGE_LIBICONV),-liconv) HTTPING_DEPENDENCIES = host-gettext \ $(if $(BR2_NEEDS_GETTEXT),gettext) \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_FFTW),fftw) HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 501baecab9..9d976d111c 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -8,6 +8,8 @@ HWDATA_VERSION = 0.230 HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz HWDATA_PATCH = hwdata_$(HWDATA_VERSION)-1.diff.gz HWDATA_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/h/hwdata/ +HWDATA_LICENSE = GPLv2+ or XFree86 1.0 license +HWDATA_LICENSE_FILES = COPYING LICENSE define HWDATA_INSTALL_TARGET_CMDS install -D -m 644 $(@D)/pci.ids $(TARGET_DIR)/usr/share/hwdata/pci.ids diff --git a/package/imagemagick/imagemagick-02-remove-magick-install-data-local-target.patch b/package/imagemagick/imagemagick-02-remove-magick-install-data-local-target.patch new file mode 100644 index 0000000000..0798f2ed8b --- /dev/null +++ b/package/imagemagick/imagemagick-02-remove-magick-install-data-local-target.patch @@ -0,0 +1,56 @@ +From 8f8f73265b281b0a01f1b6bfe8ec189b24fe75c0 Mon Sep 17 00:00:00 2001 +From: Romain Naour <romain.naour@openwide.fr> +Date: Sun, 18 May 2014 20:44:26 +0200 +Subject: [PATCH 1/1] Remove magick-install-data-local target. + +The magick-baseconfig.h is already installed by install-magickincarchHEADERS target. +This cause a race condition by calling install command twice to copy the same file at the same location at the same time. + +Fixes: +http://autobuild.buildroot.net/results/d34/d34077ce582866c50bbd90de10bbe593e39463f1/build-end.log + +Signed-off-by: Romain Naour <romain.naour@openwide.fr> +--- + Makefile.am | 4 ++-- + magick/Makefile.am | 12 ------------ + 2 files changed, 2 insertions(+), 14 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 0741336..f9598b6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -184,9 +184,9 @@ all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINE + + install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS) + +-install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS) ++install-data-local: $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS) + +-uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS) ++uninstall-local: $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS) + + clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS) + +diff --git a/magick/Makefile.am b/magick/Makefile.am +index 4c6360b..2e389f2 100644 +--- a/magick/Makefile.am ++++ b/magick/Makefile.am +@@ -471,15 +471,3 @@ MAGICK_EXTRA_DIST = \ + magick/nt-feature.c \ + magick/vms.c \ + magick/xwdfile.h_vms +- +-# Install magick-baseconfig.h +-MAGICK_INSTALL_DATA_LOCAL_TARGETS = magick-install-data-local +-magick-install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(magickincarchdir) +- $(INSTALL_HEADER) magick/magick-baseconfig.h $(DESTDIR)$(magickincarchdir)/magick-baseconfig.h +- +-# Uninstall magick-config.h +-MAGICK_UNINSTALL_LOCAL_TARGETS = magick-uninstall-local +-magick-uninstall-local: +- rm -f $(DESTDIR)$(magickincarchdir)/magick-baseconfig.h +- +-- +1.9.0 + diff --git a/package/iprutils/Config.in b/package/iprutils/Config.in index a7e3cb3c43..1bc58e814b 100644 --- a/package/iprutils/Config.in +++ b/package/iprutils/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_IPRUTILS select BR2_PACKAGE_NCURSES_TARGET_MENU select BR2_PACKAGE_LIBSYSFS select BR2_PACKAGE_PCIUTILS + depends on !BR2_bfin # pciutils help System utilities for IBM Power RAID devices diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in index 57fa5d49f1..a0d7600258 100644 --- a/package/ipsec-tools/Config.in +++ b/package/ipsec-tools/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_IPSEC_TOOLS bool "ipsec-tools" select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_FLEX + depends on BR2_USE_MMU # fork() help This package is required to support IPSec for Linux 2.6+ diff --git a/package/jack2/Config.in b/package/jack2/Config.in index a1669ee5cc..a443f5805f 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -2,7 +2,9 @@ config BR2_PACKAGE_JACK2 bool "jack2" depends on BR2_LARGEFILE # libsndfile depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib + depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_arc # missing compiler intrinsics select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_ALSA_LIB @@ -20,5 +22,7 @@ config BR2_PACKAGE_JACK2 http://jackaudio.org/ comment "jack2 needs a toolchain w/ largefile, threads, C++" + depends on BR2_USE_MMU + depends on !BR2_arc depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index f2ded00a33..68f6e428dd 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -7,23 +7,24 @@ JACK2_VERSION = ab409a65df95bc261ff72b52d6b3f4a65cf3266a JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION)) JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library) -JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib +JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python define JACK2_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) \ - ./waf configure \ + $(HOST_DIR)/usr/bin/python2 ./waf configure \ --prefix=/usr \ - --alsa \ - ) + --alsa \ + ) endef define JACK2_BUILD_CMDS - (cd $(@D); ./waf build -j $(PARALLEL_JOBS)) + (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) endef define JACK2_INSTALL_TARGET_CMDS - (cd $(@D); ./waf --destdir=$(TARGET_DIR) install) + (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) \ + install) endef $(eval $(generic-package)) diff --git a/package/lesstif/Config.in b/package/lesstif/Config.in index 3a999ead37..a6a88ec466 100644 --- a/package/lesstif/Config.in +++ b/package/lesstif/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LESSTIF select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_FREETYPE + depends on BR2_USE_MMU # fork() help lesstif is the Hungry Programmers' version of OSF/Motif diff --git a/package/libdvdnav/libdvdnav-01-fix-os2-support.patch b/package/libdvdnav/libdvdnav-01-fix-os2-support.patch new file mode 100644 index 0000000000..0f75f2fbd7 --- /dev/null +++ b/package/libdvdnav/libdvdnav-01-fix-os2-support.patch @@ -0,0 +1,32 @@ +configure: fix build on NIOS II platform + +NIOS II is a CPU architecture from Altera, which uses 'nios2' as the +architecture part of the tuple. Unfortunately, 'nios2' matches the +current '*os2*' test done by libdvdnav's configure script to detect +the OS/2 operating system. This leads to build issues as the build +process of libdvdnav then tries to use OS/2 specific compiler +options, that do not exist in the gcc used for Linux/NIOS2. + +To fix this, this patch makes the test for OS/2 a little bit more +specific: in the case of the OS/2 operating system, the OS part of the +tuple contains just 'os2' (confirmed by looking at config.guess and +config.sub in the gnuconfig project). So using '*-os2-*' will properly +match the OS/2 operating system but not the NIOS II architecture. + +Upstream-status: not needed, newer upstream versions no longer have + this test +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -166,7 +166,7 @@ + *cygwin*) + LDFLAGS="-no-undefined $LDFLAGS" + ;; +- *os2*) ++ *-os2-*) + LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" + ;; + *) diff --git a/package/libdvdread/libdvdread-01-fix-os2-support.patch b/package/libdvdread/libdvdread-01-fix-os2-support.patch new file mode 100644 index 0000000000..755bfaf3ee --- /dev/null +++ b/package/libdvdread/libdvdread-01-fix-os2-support.patch @@ -0,0 +1,31 @@ +configure: fix build on NIOS II platform + +NIOS II is a CPU architecture from Altera, which uses 'nios2' as the +architecture part of the tuple. Unfortunately, 'nios2' matches the +current '*os2*' test done by libdvdread's configure script to detect +the OS/2 operating system. This leads to build issues as the build +process of libdvdread then tries to use OS/2 specific compiler +options, that do not exist in the gcc used for Linux/NIOS2. + +To fix this, this patch makes the test for OS/2 a little bit more +specific: in the case of the OS/2 operating system, the OS part of the +tuple contains just 'os2' (confirmed by looking at config.guess and +config.sub in the gnuconfig project). So using '*-os2-*' will properly +match the OS/2 operating system but not the NIOS II architecture. + +Upstream-status: submitted +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -146,7 +146,7 @@ + *cygwin*) + LDFLAGS="-no-undefined $LDFLAGS" + ;; +- *os2*) ++ *-os2-*) + LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" + ;; + *) diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index c9130fe485..32f414e911 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -12,5 +12,6 @@ LIBFRIBIDI_LICENSE_FILES = COPYING LIBFRIBIDI_INSTALL_STAGING = YES # BR's libtool patch doesn't apply LIBFRIBIDI_AUTORECONF = YES +LIBFRIBIDI_DEPENDENCIES = host-pkgconf $(eval $(autotools-package)) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 666df744c7..dcbf8bbb73 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -30,8 +30,12 @@ LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \ OS_TEST="$(ARCH)" ifeq ($(BR2_ARCH_IS_64),y) +# MIPS64 n32 is treated as a 32-bit architecture by libnss. +# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1010730 +ifeq ($(BR2_MIPS_NABI32),) LIBNSS_BUILD_VARS += USE_64=1 endif +endif define LIBNSS_BUILD_CMDS diff --git a/package/libunwind/libunwind-disable-tests.patch b/package/libunwind/libunwind-01-disable-tests.patch index 05475a5d6c..05475a5d6c 100644 --- a/package/libunwind/libunwind-disable-tests.patch +++ b/package/libunwind/libunwind-01-disable-tests.patch diff --git a/package/libunwind/libunwind-02-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/package/libunwind/libunwind-02-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch new file mode 100644 index 0000000000..2a37ed7784 --- /dev/null +++ b/package/libunwind/libunwind-02-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch @@ -0,0 +1,56 @@ +From 24484e80b3e329c9edee1995e102f8612eedb79c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Tue, 13 May 2014 23:32:27 +0200 +Subject: [PATCH] Add AO_REQUIRE_CAS to fix build on ARM < v6 + +ARM earlier than ARMv6, such as ARMv4 and ARMv5 do not provide +optimize atomic operations in libatomic_ops. Since libunwind is using +such operations, it should define AO_REQUIRE_CAS before including +<atomic_ops.h> so that libatomic_ops knows it should use emulated +atomic operations instead (even though they are obviously a lot more +expensive). + +Also, while real atomic operations are all inline functions and +therefore linking against libatomic_ops was not required, the emulated +atomic operations actually require linking against libatomic_ops, so +the commented AC_CHECK_LIB test in acinclude.m4 is uncommented to make +sure we link against libatomic_ops. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + acinclude.m4 | 8 +------- + include/libunwind_i.h | 1 + + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 497f7c2..9c15af1 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -22,11 +22,5 @@ fi]) + AC_DEFUN([CHECK_ATOMIC_OPS], + [dnl Check whether the system has the atomic_ops package installed. + AC_CHECK_HEADERS(atomic_ops.h) +-# +-# Don't link against libatomic_ops for now. We don't want libunwind +-# to depend on libatomic_ops.so. Fortunately, none of the platforms +-# we care about so far need libatomic_ops.a (everything is done via +-# inline macros). +-# +-# AC_CHECK_LIB(atomic_ops, main) ++ AC_CHECK_LIB(atomic_ops, main) + ]) +diff --git a/include/libunwind_i.h b/include/libunwind_i.h +index 23f615e..deabdfd 100644 +--- a/include/libunwind_i.h ++++ b/include/libunwind_i.h +@@ -95,6 +95,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) + + #ifdef HAVE_ATOMIC_OPS_H ++# define AO_REQUIRE_CAS + # include <atomic_ops.h> + static inline int + cmpxchg_ptr (void *addr, void *old, void *new) +-- +1.9.2 + diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index f573722f90..a75a88848b 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -9,5 +9,10 @@ LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING LIBUNWIND_LICENSE = MIT +LIBUNWIND_AUTORECONF = YES + +ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) +LIBUNWIND_DEPENDENCIES = libatomic_ops +endif $(eval $(autotools-package)) diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in index 9d0492187b..2c9a9192f2 100644 --- a/package/libv4l/Config.in +++ b/package/libv4l/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBV4L bool "libv4l" depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_JPEG help libv4l is an accompanying collection of libraries that adds a thin @@ -61,3 +62,4 @@ endif comment "libv4l needs a toolchain w/ largefile, threads" depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6a6a76101f..7c688ef67a 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -145,13 +145,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "3.0.101" if BR2_KERNEL_HEADERS_3_0 - default "3.2.58" if BR2_KERNEL_HEADERS_3_2 - default "3.4.89" if BR2_KERNEL_HEADERS_3_4 + default "3.2.59" if BR2_KERNEL_HEADERS_3_2 + default "3.4.91" if BR2_KERNEL_HEADERS_3_4 default "3.8.13" if BR2_KERNEL_HEADERS_3_8 default "3.9.11" if BR2_KERNEL_HEADERS_3_9 - default "3.10.39" if BR2_KERNEL_HEADERS_3_10 + default "3.10.40" if BR2_KERNEL_HEADERS_3_10 default "3.11.10" if BR2_KERNEL_HEADERS_3_11 - default "3.12.19" if BR2_KERNEL_HEADERS_3_12 + default "3.12.20" if BR2_KERNEL_HEADERS_3_12 default "3.13.11" if BR2_KERNEL_HEADERS_3_13 - default "3.14.3" if BR2_KERNEL_HEADERS_3_14 + default "3.14.4" if BR2_KERNEL_HEADERS_3_14 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index f4b1b4cb8f..332d1f83a5 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -49,7 +49,8 @@ endef define LSOF_CONFIGURE_CMDS (cd $(@D) ; \ echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" \ - LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 ./Configure linux) + LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 \ + LINUX_CLIB=-DGLIBCV=2 ./Configure linux) $(LSOF_CONFIGURE_WCHAR_FIXUPS) $(LSOF_CONFIGURE_LOCALE_FIXUPS) endef diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in index cb857c80be..fae49ab215 100644 --- a/package/lttng-babeltrace/Config.in +++ b/package/lttng-babeltrace/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_LTTNG_BABELTRACE depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_LARGEFILE # util-linux + depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC # posix_fallocate help Babeltrace is part of the LTTng 2.x project. @@ -25,7 +26,8 @@ config BR2_PACKAGE_LTTNG_BABELTRACE http://lttng.org -comment "lttng-babeltrace needs a toolchain w/ wchar, threads, largefile" +comment "lttng-babeltrace needs a uclibc snapshot or (e)glib 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 + depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_UCLIBC_VERSION_SNAPSHOT || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/lua/lua.mk b/package/lua/lua.mk index bc8799a087..524f6a2dae 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -14,6 +14,8 @@ LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT LUA_LICENSE_FILES = COPYRIGHT +LUA_PROVIDES = luainterpreter + LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX ifeq ($(BR2_PACKAGE_LUA_5_2),y) diff --git a/package/luajit/luajit-06-install-so.patch b/package/luajit/luajit-06-install-so.patch new file mode 100644 index 0000000000..738ec07716 --- /dev/null +++ b/package/luajit/luajit-06-install-so.patch @@ -0,0 +1,22 @@ +fix the following runtime error : + luajit: error while loading shared libraries: libluajit-5.1.so.2: cannot open shared object file: No such file or directory + +by creating two symbolic links: + libluajit-5.1.so -> libluajit-5.1.so.2.0.3 + libluajit-5.1.so.2 -> libluajit-5.1.so.2.0.3 + +Signed-off-by: Francois Perrad <francois.perrad@gadz.org> + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -56,7 +56,7 @@ + INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) + INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) + INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) +-INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) ++INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT).$(MAJVER) + INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) + INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) + INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index c4b065da51..72240b2775 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -12,6 +12,8 @@ LUAJIT_LICENSE_FILES = COPYRIGHT LUAJIT_INSTALL_STAGING = YES +LUAJIT_PROVIDES = luainterpreter + ifneq ($(BR2_LARGEFILE),y) LUAJIT_NO_LARGEFILE = TARGET_LFSFLAGS= endif diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index 67c971622c..da02df3f8a 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -36,6 +36,7 @@ config BR2_PACKAGE_MATCHBOX_COMMON_PDA config BR2_PACKAGE_MATCHBOX_KEYBOARD bool "Matchbox Virtual Keyboard" select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO help Virtual Keyboard diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk index ff853701b7..f8bf19a64f 100644 --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk @@ -9,7 +9,7 @@ MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION) MATCHBOX_KEYBOARD_LICENSE = GPLv2+ MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING -MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey +MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expat # Workaround bug in configure script MATCHBOX_KEYBOARD_CONF_ENV = expat=yes @@ -22,8 +22,9 @@ MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FI ################################################################################ -ifeq ($(BR2_PACKAGE_PANGO),y) - MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango +ifeq ($(BR2_PACKAGE_CAIRO),y) + MATCHBOX_KEYBOARD_CONF_OPT += --enable-cairo + MATCHBOX_KEYBOARD_DEPENDENCIES += cairo else MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft endif diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 63ba57432e..fa17177b0f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -13,6 +13,8 @@ MESA3D_AUTORECONF = YES MESA3D_INSTALL_STAGING = YES +MESA3D_PROVIDES = + MESA3D_DEPENDENCIES = \ expat \ host-bison \ @@ -71,6 +73,7 @@ ifeq ($(MESA3D_DRI_DRIVERS-y),) MESA3D_CONF_OPT += \ --without-dri-drivers else +MESA3D_PROVIDES += libgl MESA3D_CONF_OPT += \ --enable-dri \ --enable-shared-glapi \ @@ -85,6 +88,7 @@ endif MESA3D_CONF_OPT += --enable-opengl ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +MESA3D_PROVIDES += libegl # egl depends on gbm, gbm depends on udev MESA3D_DEPENDENCIES += udev MESA3D_EGL_PLATFORMS = drm @@ -105,6 +109,7 @@ MESA3D_CONF_OPT += \ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) +MESA3D_PROVIDES += libgles MESA3D_CONF_OPT += --enable-gles1 --enable-gles2 else MESA3D_CONF_OPT += --disable-gles1 --disable-gles2 diff --git a/package/midori/midori.mk b/package/midori/midori.mk index ff56e4386a..d55f5f1e2e 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -14,6 +14,7 @@ MIDORI_DEPENDENCIES = \ host-intltool \ host-pkgconf \ host-vala \ + host-python \ libgtk2 \ libsexy \ webkit \ @@ -30,18 +31,18 @@ define MIDORI_CONFIGURE_CMDS $(MIDORI_WITHOUT_X11) (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) \ - ./waf configure \ + $(HOST_DIR)/usr/bin/python2 ./waf configure \ --prefix=/usr \ --disable-libnotify \ ) endef define MIDORI_BUILD_CMDS - (cd $(@D); ./waf build -j $(PARALLEL_JOBS)) + (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) endef define MIDORI_INSTALL_TARGET_CMDS - (cd $(@D); ./waf --destdir=$(TARGET_DIR) install) + (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install) endef $(eval $(generic-package)) diff --git a/package/monit/Config.in b/package/monit/Config.in index b5d4b52fb4..9f80858f8a 100644 --- a/package/monit/Config.in +++ b/package/monit/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_MONIT bool "monit" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() help Monit is a free open source utility for managing and monitoring, processes, programs, files, directories and @@ -11,4 +12,5 @@ config BR2_PACKAGE_MONIT http://mmonit.com/monit/ comment "monit needs a toolchain w/ threads" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 7237b89d3f..1bf7ad121d 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -48,6 +48,7 @@ config BR2_PACKAGE_MPD_PULSEAUDIO bool "pulseaudio" depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio depends on BR2_LARGEFILE # pulseaudio -> libsndfile + depends on BR2_USE_MMU # pulseaudio select BR2_PACKAGE_PULSEAUDIO help Enable pulseaudio output support. diff --git a/package/mplayer/mplayer-0004-add-arc-support.patch b/package/mplayer/mplayer-0004-add-arc-support.patch new file mode 100644 index 0000000000..c14ef2397f --- /dev/null +++ b/package/mplayer/mplayer-0004-add-arc-support.patch @@ -0,0 +1,13 @@ +--- mplayer-1.1/configure 2013-12-03 00:32:10.815571460 -0800 ++++ mplayer-1.1-arc/configure 2013-11-29 00:34:29.238297709 -0800 +@@ -2492,6 +2492,10 @@ + generic) + arch='generic' + ;; ++ arc) ++ arch='arc' ++ iproc='arc' ++ ;; + + *) + echo "The architecture of your CPU ($host_arch) is not supported by this configure script" diff --git a/package/mtr/mtr.mk b/package/mtr/mtr.mk index a96bf0cfaa..19dfc481b0 100644 --- a/package/mtr/mtr.mk +++ b/package/mtr/mtr.mk @@ -21,4 +21,4 @@ endif MTR_POST_PATCH_HOOKS += MTR_DISABLE_RES_NINIT -$(eval $(call autotools-package)) +$(eval $(autotools-package)) diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk index 5b30d84758..808abcea45 100644 --- a/package/mysql/mysql.mk +++ b/package/mysql/mysql.mk @@ -33,6 +33,14 @@ MYSQL_CONF_OPT = \ --enable-thread-safe-client \ --disable-mysql-maintainer-mode +ifeq ($(BR2_PACKAGE_OPENSSL),y) +MYSQL_DEPENDENCIES += openssl +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +MYSQL_DEPENDENCIES += zlib +endif + ifeq ($(BR2_PACKAGE_MYSQL_SERVER),y) MYSQL_DEPENDENCIES += host-mysql host-bison HOST_MYSQL_DEPENDENCIES = diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 63ec97a4d3..1372f2fcd3 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -24,6 +24,8 @@ NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp \ --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \ --with-out-transports="Unix" \ --disable-manuals +NETSNMP_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install +NETSNMP_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_MAKE = $(MAKE1) NETSNMP_CONFIG_SCRIPTS = net-snmp-config @@ -48,34 +50,35 @@ else NETSNMP_CONF_OPT += --without-openssl endif -# Docs -NETSNMP_CONF_OPT += --disable-manuals - ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y) NETSNMP_CONF_OPT += --disable-mib-loading NETSNMP_CONF_OPT += --disable-mibs endif +ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING),y) + NETSNMP_CONF_OPT += --disable-debugging +endif + # Remove IPv6 MIBs if there's no IPv6 ifneq ($(BR2_INET_IPV6),y) define NETSNMP_REMOVE_MIBS_IPV6 rm -f $(TARGET_DIR)/usr/share/snmp/mibs/IPV6* endef -endif -ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING),y) - NETSNMP_CONF_OPT += --disable-debugging +NETSNMP_POST_INSTALL_TARGET_HOOKS += NETSNMP_REMOVE_MIBS_IPV6 endif -define NETSNMP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install - $(INSTALL) -D -m 0755 package/netsnmp/S59snmpd \ - $(TARGET_DIR)/etc/init.d/S59snmpd +define NETSNMP_REMOVE_BLOAT_MIBS for mib in $(NETSNMP_BLOAT_MIBS); do \ rm -f $(TARGET_DIR)/usr/share/snmp/mibs/$$mib-MIB.txt; \ done - $(NETSNMP_REMOVE_MIBS_IPV6) +endef + +NETSNMP_POST_INSTALL_TARGET_HOOKS += NETSNMP_REMOVE_BLOAT_MIBS + +define NETSNMP_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/netsnmp/S59snmpd \ + $(TARGET_DIR)/etc/init.d/S59snmpd endef define NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP diff --git a/package/newt/Config.in b/package/newt/Config.in index 1737f310b1..1b3068a168 100644 --- a/package/newt/Config.in +++ b/package/newt/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_NEWT bool "newt" depends on BR2_USE_WCHAR + depends on BR2_USE_MMU # slang select BR2_PACKAGE_SLANG select BR2_PACKAGE_POPT select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE @@ -10,4 +11,5 @@ config BR2_PACKAGE_NEWT http://www.redhat.com/ comment "newt needs a toolchain w/ wchar" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR diff --git a/package/nodejs/nodejs-0003-use-python-variable.patch b/package/nodejs/nodejs-0003-use-python-variable.patch new file mode 100644 index 0000000000..f231f4c2f2 --- /dev/null +++ b/package/nodejs/nodejs-0003-use-python-variable.patch @@ -0,0 +1,43 @@ +Use a python variable instead of hardcoding Python + +The nodejs build system uses python in a number of locations. However, +there are some locations where it hardcodes 'python' as the Python +interpreter. However, this causes problems when we need to use python2 +instead of just python. + +This patch fixes that by using the python variable already in place in +the nodejs build system. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/deps/v8/tools/gyp/v8.gyp +=================================================================== +--- a/deps/v8/tools/gyp/v8.gyp ++++ b/deps/v8/tools/gyp/v8.gyp +@@ -792,7 +792,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', + ], + 'action': [ +- 'python', ++ '<(python)', + '../../tools/js2c.py', + '<@(_outputs)', + 'CORE', +@@ -810,7 +810,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', + ], + 'action': [ +- 'python', ++ '<(python)', + '../../tools/js2c.py', + '<@(_outputs)', + 'EXPERIMENTAL', +@@ -840,7 +840,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc', + ], + 'action': [ +- 'python', ++ '<(python)', + '../../tools/gen-postmortem-metadata.py', + '<@(_outputs)', + '<@(heapobject_files)' diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index b5973b55db..a85384e448 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -19,8 +19,6 @@ endif # nodejs build system is based on python, but only support python-2.6 or # python-2.7. So, we have to enforce PYTHON interpreter to be python2. -# However, few build scripts hard-code 'python' as the interpreter to be -# invoked; so we have to manually fix them. define HOST_NODEJS_CONFIGURE_CMDS # Build with the static, built-in OpenSSL which is supplied as part of # the nodejs source distribution. This is needed on the host because @@ -35,8 +33,6 @@ define HOST_NODEJS_CONFIGURE_CMDS --without-dtrace \ --without-etw \ ) - $(SED) "s@'python',@'$(HOST_DIR)/usr/bin/python2',@" \ - $(@D)/deps/v8/tools/gyp/v8.gyp endef define HOST_NODEJS_BUILD_CMDS @@ -81,8 +77,6 @@ define NODEJS_CONFIGURE_CMDS $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \ --dest-os=linux \ ) - $(SED) "s@'python',@'$(HOST_DIR)/usr/bin/python2',@" \ - $(@D)/deps/v8/tools/gyp/v8.gyp endef define NODEJS_BUILD_CMDS diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 49ada5d163..f9ee416e77 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -189,12 +189,14 @@ config BR2_PACKAGE_OPENCV_WITH_V4L bool "v4l support" depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # libv4l fork select BR2_PACKAGE_LIBV4L help Enable Video 4 Linux support. comment "v4l support needs a toolchain w/ largefile, threads" depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU comment "Install options" diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in index 85739617e5..d87f8bea4e 100644 --- a/package/openpowerlink/Config.in +++ b/package/openpowerlink/Config.in @@ -60,6 +60,9 @@ config BR2_PACKAGE_OPENPOWERLINK_82573 config BR2_PACKAGE_OPENPOWERLINK_8255x bool "Intel 8255x" +config BR2_PACKAGE_OPENPOWERLINK_I210 + bool "Intel I210" + config BR2_PACKAGE_OPENPOWERLINK_RTL8139 bool "Realtek RTL-8139" diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk index 37a06e52c6..152f014acb 100644 --- a/package/openpowerlink/openpowerlink.mk +++ b/package/openpowerlink/openpowerlink.mk @@ -5,9 +5,8 @@ ################################################################################ OPENPOWERLINK_VERSION = V1.08.4 -OPENPOWERLINK_SOURCE = openPOWERLINK-$(OPENPOWERLINK_VERSION).zip -OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/V1.8.4 - +OPENPOWERLINK_SITE = http://git.code.sf.net/p/openpowerlink/code +OPENPOWERLINK_SITE_METHOD = git OPENPOWERLINK_LICENSE = BSD-2c, GPLv2 OPENPOWERLINK_LICENSE_FILES = license.txt OPENPOWERLINK_INSTALL_STAGING = YES @@ -52,10 +51,12 @@ endif ifeq ($(BR2_PACKAGE_OPENPOWERLINK_82573),y) OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=82573 -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_RTL8139),y) -OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=8139 else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_8255x),y) OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=8255x +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_I210),y) +OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=I210 +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_RTL8139),y) +OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=8139 endif ifeq ($(BR2_PACKAGE_OPENPOWERLINK_MN),y) @@ -89,11 +90,4 @@ else OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_LINUX_KERNEL=OFF endif -define OPENPOWERLINK_EXTRACT_CMDS - $(RM) -rf $(OPENPOWERLINK_DIR) - unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(OPENPOWERLINK_SOURCE) - test -d $(OPENPOWERLINK_DIR) || \ - mv $(BUILD_DIR)/$(subst .zip,,$(OPENPOWERLINK_SOURCE)) $(OPENPOWERLINK_DIR) -endef - $(eval $(cmake-package)) diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index a989ffeb36..0355678fb0 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.3.3 +OPENVPN_VERSION = 2.3.4 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf diff --git a/package/pciutils/Config.in b/package/pciutils/Config.in index a082f23997..d46df6c0d6 100644 --- a/package/pciutils/Config.in +++ b/package/pciutils/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PCIUTILS bool "pciutils" + # PCI not supported on Blackfin + depends on !BR2_bfin help Various utilities dealing with the PCI bus. Provides things like setpci and lspci. diff --git a/package/php-imagick/Config.in b/package/php-imagick/Config.in index 1d55fccdda..a5e32a51fb 100644 --- a/package/php-imagick/Config.in +++ b/package/php-imagick/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PHP_IMAGICK bool "php-imagick" depends on BR2_PACKAGE_PHP + depends on BR2_USE_MMU # imagemagick select BR2_PACKAGE_IMAGEMAGICK help PHP wrapper to the ImageMagick library. diff --git a/package/php/php-01-no-iconv-search.patch b/package/php/php-01-no-iconv-search.patch index d2a7ae3a13..1979b7d0a5 100644 --- a/package/php/php-01-no-iconv-search.patch +++ b/package/php/php-01-no-iconv-search.patch @@ -1,32 +1,65 @@ -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. +Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not +PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use +test instead of AC_TRY_LINK to find headers which is bad, +specially when adding /usr and /usr/local to the mix. +Do basically the same with ext/iconv/config.m4 by tweaking +PHP_ICONV_H_PATH which, again, uses test and absolute paths. +And all this directly in configure since autoreconf isn't +happy with php. 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" +diff -Nura php-5.5.11.orig/configure php-5.5.11/configure +--- php-5.5.11.orig/configure 2014-04-16 14:55:52.300838499 -0300 ++++ php-5.5.11/configure 2014-04-22 21:54:01.499097295 -0300 +@@ -45751,12 +45751,6 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$unique=set" + +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" - fi +- + fi + + fi +@@ -45786,14 +45780,7 @@ + PHP_ICONV_PREFIX="$ICONV_DIR" + fi + +- 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" - else -- PHP_ICONV_PREFIX="$ICONV_DIR" +- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h" - fi ++ PHP_ICONV_H_PATH="iconv.h" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5 + $as_echo_n "checking if iconv is glibc's... " >&6; } +@@ -46191,8 +46178,6 @@ + ext_builddir=ext/iconv + ext_srcdir=$abs_srcdir/ext/iconv + +- ac_extra=`echo "-I\"$PHP_ICONV_PREFIX/include\""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` +- + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_ICONV_SHARED=no + +@@ -97419,12 +97404,6 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$unique=set" + +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi - -+ PHP_ICONV_PREFIX="$ICONV_DIR" - CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" - LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" + fi + fi diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6eca6d4714..5116ed9fea 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -241,6 +241,25 @@ $(BUILD_DIR)/%/.stamp_dircleaned: rm -Rf $(@D) ################################################################################ +# virt-provides-single -- check that provider-pkg is the declared provider for +# the virtual package virt-pkg +# +# argument 1 is the lower-case name of the virtual package +# argument 2 is the upper-case name of the virtual package +# argument 3 is the lower-case name of the provider +# +# example: +# $(call virt-provides-single,libegl,LIBEGL,rpi-userland) +################################################################################ +define virt-provides-single +ifneq ($$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))),$(3)) +$$(error Configuration error: both "$(3)" and $$(BR2_PACKAGE_PROVIDES_$(2))\ +are selected as providers for virtual package "$(1)". Only one provider can\ +be selected at a time. Please fix your configuration) +endif +endef + +################################################################################ # inner-generic-package -- generates the make targets needed to build a # generic package # @@ -512,7 +531,7 @@ $(1)-show-depends: $(1)-graph-depends: @$(INSTALL) -d $(O)/graphs @cd "$(CONFIG_DIR)"; \ - $(TOPDIR)/support/scripts/graph-depends -p $(1) -d $(BR_GRAPH_DEPTH) \ + $(TOPDIR)/support/scripts/graph-depends -p $(1) $(BR2_GRAPH_DEPS_OPTS) \ |tee $(O)/graphs/$$(@).dot \ |dot -T$(BR_GRAPH_OUT) -o $(O)/graphs/$$(@).$(BR_GRAPH_OUT) @@ -626,10 +645,24 @@ endif # ifneq ($(call qstrip,$$($(2)_SOURCE)),) # configuration ifeq ($$($$($(2)_KCONFIG_VAR)),y) +# Ensure the calling package is the declared provider for all the virtual +# packages it claims to be an implementation of. +ifneq ($$($(2)_PROVIDES),) +$$(foreach pkg,$$($(2)_PROVIDES),\ + $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) +endif + TARGETS += $(1) + +ifneq ($$($(2)_PERMISSIONS),) PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) +endif +ifneq ($$($(2)_DEVICES),) PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) +endif +ifneq ($$($(2)_USERS),) PACKAGES_USERS += $$($(2)_USERS)$$(sep) +endif ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index da3f0fc318..c627a6485e 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -110,8 +110,8 @@ define legal-manifest # pkg, version, license, license-files, source, {HOST|TARG endef define legal-license-header # pkg, license-file, {HOST|TARGET} - echo -e "$(LEGAL_INFO_SEPARATOR)\n\t$(1):" \ - "$(2)\n$(LEGAL_INFO_SEPARATOR)\n\n" >>$(LEGAL_LICENSES_TXT_$(3)) + printf "$(LEGAL_INFO_SEPARATOR)\n\t$(1):\ + $(2)\n$(LEGAL_INFO_SEPARATOR)\n\n\n" >>$(LEGAL_LICENSES_TXT_$(3)) endef define legal-license-nofiles # pkg, {HOST|TARGET} diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2606e25e7f..b3317379e0 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -14,6 +14,10 @@ ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) POSTGRESQL_CONF_OPT += --disable-thread-safety endif +ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) + POSTGRESQL_CONF_OPT += --disable-spinlocks +endif + ifeq ($(BR2_PACKAGE_READLINE),y) POSTGRESQL_DEPENDENCIES += readline else diff --git a/package/pulseaudio/Config.in b/package/pulseaudio/Config.in index e5b9d8a476..ac6222c59a 100644 --- a/package/pulseaudio/Config.in +++ b/package/pulseaudio/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PULSEAUDIO select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_SPEEX depends on BR2_LARGEFILE + depends on BR2_USE_MMU # fork() help PulseAudio is a sound system for POSIX OSes, meaning that it is a proxy for your sound applications. It allows you to do @@ -30,4 +31,5 @@ config BR2_PACKAGE_PULSEAUDIO_DAEMON endif comment "pulseaudio needs a toolchain w/ wchar, largefile, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/python/python-110-optional-db.patch b/package/python/python-110-optional-db.patch index ea756daa8f..a3e5fe8efc 100644 --- a/package/python/python-110-optional-db.patch +++ b/package/python/python-110-optional-db.patch @@ -70,7 +70,7 @@ Index: b/configure.ac + AS_HELP_STRING([--disable-bsddb], [disable BerkeyleyDB]), + [ if test "$enableval" = "no"; then + BSDDB=no -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bsddb" ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bsddb" + else + BSDDB=yes + fi], [ BSDDB=yes ]) diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch index 06436b4a42..6283bbe0c5 100644 --- a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch +++ b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch @@ -14,13 +14,14 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,11 @@ +@@ -0,0 +1,12 @@ +include(../common/linux_device_pre.conf) + +#modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +QMAKE_CXXFLAGS_RELEASE += -O3 ++CONFIG += nostrip + +QMAKE_LIBS += -lrt -lpthread -ldl + diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in index 30c2e79182..32656bed40 100644 --- a/package/qt5/qt5quick1/Config.in +++ b/package/qt5/qt5quick1/Config.in @@ -2,14 +2,12 @@ config BR2_PACKAGE_QT5QUICK1 bool "qt5quick1" select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_NETWORK select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SCRIPT select BR2_PACKAGE_QT5XMLPATTERNS - select BR2_PACKAGE_QT5DECLARATIVE # This module does not support static linking depends on !BR2_PREFER_STATIC_LIB - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE help Qt is a cross-platform application and UI framework for @@ -19,7 +17,6 @@ config BR2_PACKAGE_QT5QUICK1 http://qt-project.org -comment "qt5quick1 needs a toolchain w/ dynamic library and an OpenGL-capable backend" +comment "qt5quick1 needs a toolchain w/ dynamic library" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES || \ - BR2_PREFER_STATIC_LIB + depends on BR2_PREFER_STATIC_LIB diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk index 624b130775..e9d7a64ae6 100644 --- a/package/qt5/qt5quick1/qt5quick1.mk +++ b/package/qt5/qt5quick1/qt5quick1.mk @@ -7,7 +7,7 @@ QT5QUICK1_VERSION = $(QT5_VERSION) QT5QUICK1_SITE = $(QT5_SITE) QT5QUICK1_SOURCE = qtquick1-opensource-src-$(QT5QUICK1_VERSION).tar.xz -QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative \ +QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script \ $(if $(BR2_PACKAGE_QT5WEBKIT),qt5webkit) QT5QUICK1_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 300b9d9904..33b775d06e 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -7,7 +7,7 @@ QT5WEBKIT_VERSION = $(QT5_VERSION) QT5WEBKIT_SITE = $(QT5_SITE) QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison +QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison host-flex QT5WEBKIT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) diff --git a/package/rdesktop/rdesktop-8bit-colors.patch b/package/rdesktop/rdesktop-01-8bit-colors.patch index 710f8debef..710f8debef 100644 --- a/package/rdesktop/rdesktop-8bit-colors.patch +++ b/package/rdesktop/rdesktop-01-8bit-colors.patch diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index 94e02829d4..6829709fc8 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -4,11 +4,20 @@ # ################################################################################ -RDESKTOP_VERSION = 1.5.0 +RDESKTOP_VERSION = 1.8.2 RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION) -RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt -RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr -RDESKTOP_LICENSE = GPLv2+ with exceptions +RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \ + $(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \ + $(if $(BR2_PACKAGE_LIBAO),libao) \ + $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) +RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr --disable-credssp +RDESKTOP_LICENSE = GPLv3+ RDESKTOP_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_PCSC_LITE),y) +RDESKTOP_DEPENDENCIES += pcsc-lite +else +RDESKTOP_CONF_OPT += --disable-smartcard +endif + $(eval $(autotools-package)) diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index f6e4443db5..8b225bab23 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,13 +4,15 @@ # ################################################################################ -RPI_USERLAND_VERSION = eccb81050afd177da1923404b366c6226f29bfe0 +RPI_USERLAND_VERSION = 4855a45b118cb7b97b83e5160551db9813487c91 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3c RPI_USERLAND_LICENSE_FILES = LICENCE RPI_USERLAND_INSTALL_STAGING = YES RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF +RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg + define RPI_USERLAND_POST_TARGET_CLEANUP rm -Rf $(TARGET_DIR)/usr/src endef diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in index 8a84fea53b..4ce1918551 100644 --- a/package/rsyslog/Config.in +++ b/package/rsyslog/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_RSYSLOG select BR2_PACKAGE_UTIL_LINUX_LIBUUID depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_LARGEFILE # util-linux + depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR # util-linux help Rsyslog is a powerful and flexible syslog implementation @@ -15,4 +16,5 @@ config BR2_PACKAGE_RSYSLOG http://www.rsyslog.com comment "rsyslog needs a toolchain w/ largefile, wchar, threads" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || !BR2_USE_WCHAR diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index c124c020a9..88747b752b 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -24,6 +24,7 @@ ifeq ($(BR2_PACKAGE_LIBEE),y) endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) + RSYSLOG_DEPENDENCIES += libgcrypt RSYSLOG_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config RSYSLOG_CONF_OPT += --enable-libgcrypt=yes else diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 0ea352d7cc..65a59f5509 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -12,7 +12,8 @@ HOST_RUBY_DEPENDENCIES = host-pkgconf RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) RUBY_MAKE = $(MAKE1) RUBY_CONF_OPT = --disable-install-doc --disable-rpath -HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline +HOST_RUBY_CONF_OPT = --disable-install-doc \ + --with-out-ext=curses,openssl,readline RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others RUBY_LICENSE_FILES = LEGAL COPYING BSDL diff --git a/package/samba/Config.in b/package/samba/Config.in index c5b7e48da0..8dd0bf2b4a 100644 --- a/package/samba/Config.in +++ b/package/samba/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_SAMBA bool "samba" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on !BR2_avr32 # binary too large, relocations don't fit + depends on !BR2_nios2 # binary too large, relocations don't fit select BR2_PACKAGE_POPT help Provides secure, stable and fast file and print services @@ -14,6 +16,7 @@ config BR2_PACKAGE_SAMBA so choose only the components you need. comment "samba needs a toolchain w/ threads" + depends on !BR2_avr32 depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/samba4/Config.in b/package/samba4/Config.in index 77a46cd713..7008ba2037 100644 --- a/package/samba4/Config.in +++ b/package/samba4/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_SAMBA4 depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS # talloc python threads depends on !BR2_avr32 # bad toolchain + depends on !BR2_nios2 # binary too large, relocations don't fit select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_POPT select BR2_PACKAGE_PYTHON diff --git a/package/samba4/samba4-0009-disable-libbsd.patch b/package/samba4/samba4-0009-disable-libbsd.patch new file mode 100644 index 0000000000..b29a812012 --- /dev/null +++ b/package/samba4/samba4-0009-disable-libbsd.patch @@ -0,0 +1,26 @@ +Disable libbsd support, samba4 uses a global config.h for its own +codebase and that of heimdal (when building with builtin). +This causes redefinition conflicts for link(2) when both standard unistd.h +and bsd/unistd.h get included. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura samba-4.1.7.orig/lib/replace/wscript samba-4.1.7/lib/replace/wscript +--- samba-4.1.7.orig/lib/replace/wscript 2014-04-17 04:59:14.000000000 -0300 ++++ samba-4.1.7/lib/replace/wscript 2014-05-19 09:17:25.561947774 -0300 +@@ -253,15 +253,6 @@ + conf.CHECK_FUNCS('strtouq strtoll __strtoll strtoq memalign posix_memalign') + conf.CHECK_FUNCS('prctl') + +- # libbsd on some platforms provides strlcpy and strlcat +- if not conf.CHECK_FUNCS('strlcpy strlcat'): +- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True) +- if not conf.CHECK_FUNCS('getpeereid'): +- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h'): +- conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h') +- + conf.CHECK_CODE(''' + struct ucred cred; + socklen_t cred_len; diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in index 04222fc6d8..8156e858dc 100644 --- a/package/sane-backends/Config.in +++ b/package/sane-backends/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SANE_BACKENDS bool "sane-backends" + depends on BR2_USE_MMU # fork() help SANE - Scanner Access Now Easy diff --git a/package/slang/Config.in b/package/slang/Config.in index 9d8f047b27..a500ff5b7d 100644 --- a/package/slang/Config.in +++ b/package/slang/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SLANG bool "slang" + depends on BR2_USE_MMU # fork() help Multi-platform console display library. diff --git a/package/sunxi-mali/sunxi-mali.mk b/package/sunxi-mali/sunxi-mali.mk index c625c6ef7e..c6900c8e77 100644 --- a/package/sunxi-mali/sunxi-mali.mk +++ b/package/sunxi-mali/sunxi-mali.mk @@ -9,6 +9,7 @@ SUNXI_MALI_SITE = $(call github,linux-sunxi,sunxi-mali,$(SUNXI_MALI_VERSION)) SUNXI_MALI_INSTALL_STAGING = YES SUNXI_MALI_DEPENDENCIES = sunxi-mali-prop +SUNXI_MALI_PROVIDES = libegl libgles # The options below must be provided in the environment. Providing these # through options overrides the value and prevents the makefiles from diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index 1216bccf8c..6339d762e5 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SYSKLOGD bool "syslogd & klogd" depends on BR2_LARGEFILE + depends on BR2_USE_MMU # fork() help System log daemons syslogd and klogd. @@ -8,3 +9,4 @@ config BR2_PACKAGE_SYSKLOGD comment "syslogd needs a toolchain w/ largefile" depends on !BR2_LARGEFILE + depends on BR2_USE_MMU diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index f7661abb8c..e1c984fec8 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -17,6 +17,8 @@ SYSTEMD_DEPENDENCIES = \ kmod \ host-gperf +SYSTEMD_PROVIDES = udev + # Make sure that systemd will always be built after busybox so that we have # a consistent init setup between two builds ifeq ($(BR2_PACKAGE_BUSYBOX),y) diff --git a/package/thrift/Config.in b/package/thrift/Config.in index a7f3479982..ac998014bc 100644 --- a/package/thrift/Config.in +++ b/package/thrift/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_THRIFT depends on BR2_USE_WCHAR depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_arc # atomic builtins select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_OPENSSL @@ -21,3 +22,4 @@ config BR2_PACKAGE_THRIFT comment "thrift needs a toolchain w/ C++, largefile, wchar, threads" depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP + depends on !BR2_arc diff --git a/package/ti-gfx/ti-gfx.mk b/package/ti-gfx/ti-gfx.mk index e48715d8dc..324e19cc99 100644 --- a/package/ti-gfx/ti-gfx.mk +++ b/package/ti-gfx/ti-gfx.mk @@ -19,6 +19,7 @@ TI_GFX_LICENSE_FILES = TSPA.txt TI_GFX_INSTALL_STAGING = YES TI_GFX_DEPENDENCIES = linux +TI_GFX_PROVIDES = libegl libgles powervr ifeq ($(BR2_PACKAGE_TI_GFX_ES3),y) TI_GFX_OMAPES = 3.x diff --git a/package/tstools/Config.in b/package/tstools/Config.in index 24d4403105..6712b0f8ed 100644 --- a/package/tstools/Config.in +++ b/package/tstools/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TSTOOLS bool "tstools" depends on BR2_LARGEFILE + depends on BR2_USE_MMU # fork() help This is a set of cross-platform command line tools for working with MPEG data @@ -18,3 +19,4 @@ config BR2_PACKAGE_TSTOOLS comment "tstools needs a toolchain w/ largefile" depends on !BR2_LARGEFILE + depends on BR2_USE_MMU diff --git a/package/tz/tz.mk b/package/tz/tz.mk index 865ba3bb9c..770cc46b30 100644 --- a/package/tz/tz.mk +++ b/package/tz/tz.mk @@ -27,6 +27,11 @@ define TZ_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc if [ -n "$(TZ_LOCALTIME)" ]; then \ + if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \ + printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \ + "$(TZDATA_LOCALTIME)"; \ + exit 1; \ + fi; \ cd $(TARGET_DIR)/etc; \ ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \ fi diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index a498d10c35..58b5f130e4 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -44,6 +44,11 @@ define TZDATA_INSTALL_TARGET_CMDS ln -sfn "$${zone}" "$${zone##*/}"; \ done if [ -n "$(TZDATA_LOCALTIME)" ]; then \ + if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \ + printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \ + "$(TZDATA_LOCALTIME)"; \ + exit 1; \ + fi; \ cd $(TARGET_DIR)/etc; \ ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) localtime; \ echo "$(TZDATA_LOCALTIME)" >timezone; \ diff --git a/package/udev/S10udev b/package/udev/S10udev index 2c7b7e917f..cf825b418b 100755 --- a/package/udev/S10udev +++ b/package/udev/S10udev @@ -27,8 +27,8 @@ test -r $UDEV_CONFIG || exit 6 case "$1" in start) - echo -n "Populating ${udev_root:-/dev} using udev: " - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug + printf "Populating ${udev_root:-/dev} using udev: " + printf '\000\000\000\000' > /proc/sys/kernel/hotplug $UDEV_BIN -d || (echo "FAIL" && exit 1) udevadm trigger echo "done" diff --git a/package/webkit/Config.in b/package/webkit/Config.in index 21da2b2392..c86eb94b83 100644 --- a/package/webkit/Config.in +++ b/package/webkit/Config.in @@ -31,6 +31,8 @@ config BR2_PACKAGE_WEBKIT select BR2_PACKAGE_SQLITE select BR2_PACKAGE_WEBP select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_HAS_LIBGL help WebKit is an open source, standards compliant web browser engine. diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk index 21b535ffe1..6b04ccd26e 100644 --- a/package/webkit/webkit.mk +++ b/package/webkit/webkit.mk @@ -11,6 +11,10 @@ WEBKIT_INSTALL_STAGING = YES WEBKIT_DEPENDENCIES = host-ruby host-flex host-bison host-gperf enchant harfbuzz \ icu jpeg libcurl libgail libsecret libsoup libxml2 libxslt libgtk2 sqlite webp +WEBKIT_DEPENDENCIES += \ + $(if $(BR_PACKAGE_XLIB_LIBXCOMPOSITE),xlib_libXcomposite) \ + $(if $(BR_PACKAGE_XLIB_LIBXDAMAGE),xlib_libXdamage) + # webkit-disable-tests.patch changes configure.ac therefore autoreconf required WEBKIT_AUTORECONF = YES WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools @@ -48,4 +52,21 @@ WEBKIT_CONF_OPT += \ WEBKIT_CONF_OPT += --with-target=x11 WEBKIT_DEPENDENCIES += xlib_libXt +ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy) +WEBKIT_CONF_OPT += --enable-gles2 +WEBKIT_DEPENDENCIES += libegl libgles +else +WEBKIT_CONF_OPT += --disable-gles2 +endif + +# gles/egl support is prefered over opengl by webkit configure +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +WEBKIT_CONF_OPT += --with-acceleration-backend=opengl +WEBKIT_DEPENDENCIES += libgl +else +# OpenGL/glx is auto-detected due to the presence of gl.h/glx.h, which is not +# enough, so disable glx and the use of the OpenGL acceleration backend here +WEBKIT_CONF_OPT += --disable-glx --with-acceleration-backend=none +endif + $(eval $(autotools-package)) diff --git a/package/wpa_supplicant/wpa_supplicant-0002-X.509-Fix-internal-TLS-X.509-validation-of-PKCS-1-si.patch b/package/wpa_supplicant/wpa_supplicant-0002-X.509-Fix-internal-TLS-X.509-validation-of-PKCS-1-si.patch new file mode 100644 index 0000000000..5a5b0c3845 --- /dev/null +++ b/package/wpa_supplicant/wpa_supplicant-0002-X.509-Fix-internal-TLS-X.509-validation-of-PKCS-1-si.patch @@ -0,0 +1,38 @@ +From 9c29d48725fd40a82407a89f193cf009aeef9745 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@qca.qualcomm.com> +Date: Mon, 19 May 2014 23:25:38 +0300 +Subject: [PATCH] X.509: Fix internal TLS/X.509 validation of PKCS#1 + signature + +Verify that there is no extra data after the hash field. This is needed +to avoid potential attacks using additional data to construct a value +that passes the RSA operation and allows the hash value to be forged. + +Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> +--- + src/tls/x509v3.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c +index a9483cb7fc2f..751a268e1caf 100644 +--- a/src/tls/x509v3.c ++++ b/src/tls/x509v3.c +@@ -1783,6 +1783,15 @@ skip_digest_oid: + return -1; + } + ++ if (hdr.payload + hdr.length < data + data_len) { ++ wpa_hexdump(MSG_INFO, ++ "X509: Extra data after certificate signature hash", ++ hdr.payload + hdr.length, ++ data + data_len - hdr.payload - hdr.length); ++ os_free(data); ++ return -1; ++ } ++ + os_free(data); + + wpa_printf(MSG_DEBUG, "X509: Certificate Digest matches with " +-- +2.0.0.rc2 + diff --git a/package/wpa_supplicant/wpa_supplicant-0003-PKCS-1-Allow-only-BT-01-for-signature-in-internal-TL.patch b/package/wpa_supplicant/wpa_supplicant-0003-PKCS-1-Allow-only-BT-01-for-signature-in-internal-TL.patch new file mode 100644 index 0000000000..57d752d0bb --- /dev/null +++ b/package/wpa_supplicant/wpa_supplicant-0003-PKCS-1-Allow-only-BT-01-for-signature-in-internal-TL.patch @@ -0,0 +1,67 @@ +From e6d83cc7babb978ba53ae8686159b41ab0f448cc Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@qca.qualcomm.com> +Date: Mon, 19 May 2014 23:26:19 +0300 +Subject: [PATCH] PKCS #1: Allow only BT=01 for signature in internal TLS + +Based on PKCS #1, v1.5, 10.1.3, the block type shall be 01 for a +signature. This avoids a potential attack vector for internal TLS/X.509 +implementation. + +Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> +--- + src/tls/pkcs1.c | 29 ++++++++++------------------- + 1 file changed, 10 insertions(+), 19 deletions(-) + +diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c +index b6fde5ee868a..af58a42987c6 100644 +--- a/src/tls/pkcs1.c ++++ b/src/tls/pkcs1.c +@@ -142,35 +142,26 @@ int pkcs1_decrypt_public_key(struct crypto_rsa_key *key, + * BT = 00 or 01 + * PS = k-3-||D|| times (00 if BT=00) or (FF if BT=01) + * k = length of modulus in octets ++ * ++ * Based on 10.1.3, "The block type shall be 01" for a signature. + */ + + if (len < 3 + 8 + 16 /* min hash len */ || +- plain[0] != 0x00 || (plain[1] != 0x00 && plain[1] != 0x01)) { ++ plain[0] != 0x00 || plain[1] != 0x01) { + wpa_printf(MSG_INFO, "LibTomCrypt: Invalid signature EB " + "structure"); + return -1; + } + + pos = plain + 3; +- if (plain[1] == 0x00) { +- /* BT = 00 */ +- if (plain[2] != 0x00) { +- wpa_printf(MSG_INFO, "LibTomCrypt: Invalid signature " +- "PS (BT=00)"); +- return -1; +- } +- while (pos + 1 < plain + len && *pos == 0x00 && pos[1] == 0x00) +- pos++; +- } else { +- /* BT = 01 */ +- if (plain[2] != 0xff) { +- wpa_printf(MSG_INFO, "LibTomCrypt: Invalid signature " +- "PS (BT=01)"); +- return -1; +- } +- while (pos < plain + len && *pos == 0xff) +- pos++; ++ /* BT = 01 */ ++ if (plain[2] != 0xff) { ++ wpa_printf(MSG_INFO, "LibTomCrypt: Invalid signature " ++ "PS (BT=01)"); ++ return -1; + } ++ while (pos < plain + len && *pos == 0xff) ++ pos++; + + if (pos - plain - 2 < 8) { + /* PKCS #1 v1.5, 8.1: At least eight octets long PS */ +-- +2.0.0.rc2 + diff --git a/package/wpa_supplicant/wpa_supplicant-0004-PKCS-1-Enforce-minimum-padding-for-decryption-in-int.patch b/package/wpa_supplicant/wpa_supplicant-0004-PKCS-1-Enforce-minimum-padding-for-decryption-in-int.patch new file mode 100644 index 0000000000..7862de7a64 --- /dev/null +++ b/package/wpa_supplicant/wpa_supplicant-0004-PKCS-1-Enforce-minimum-padding-for-decryption-in-int.patch @@ -0,0 +1,35 @@ +From 6c5be116dd6997f68e524247751cff53c74519d7 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@qca.qualcomm.com> +Date: Mon, 19 May 2014 23:26:43 +0300 +Subject: [PATCH] PKCS #1: Enforce minimum padding for decryption in + internal TLS + +Follow the PKCS #1 v1.5, 8.1 constraint of at least eight octets long PS +for the case where the internal TLS implementation decrypts PKCS #1 +formatted data. Similar limit was already in place for signature +validation, but not for this decryption routine. + +Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> +--- + src/tls/pkcs1.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c +index af58a42987c6..ea3e6171a1d1 100644 +--- a/src/tls/pkcs1.c ++++ b/src/tls/pkcs1.c +@@ -113,6 +113,11 @@ int pkcs1_v15_private_key_decrypt(struct crypto_rsa_key *key, + pos++; + if (pos == end) + return -1; ++ if (pos - out - 2 < 8) { ++ /* PKCS #1 v1.5, 8.1: At least eight octets long PS */ ++ wpa_printf(MSG_INFO, "LibTomCrypt: Too short padding"); ++ return -1; ++ } + pos++; + + *outlen -= pos - out; +-- +2.0.0.rc2 + diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm-01-fork-check.patch b/package/x11r7/xlib_libXpm/xlib_libXpm-01-fork-check.patch new file mode 100644 index 0000000000..fb4fb7d133 --- /dev/null +++ b/package/x11r7/xlib_libXpm/xlib_libXpm-01-fork-check.patch @@ -0,0 +1,21 @@ +Allow usage when fork() is not available + +When fork() is not available, we need to define NO_ZPIPE so that +libXpm doesn't try to fork/exec to use a pipe to uncompress compressed +.xpm files. There is obviously a loss of functionality, but loading +uncompressed .xpm files should continue to work. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -22,6 +22,7 @@ + + # Checks for library functions + AC_CHECK_FUNCS([strlcat]) ++AC_CHECK_FUNC([fork],[], AC_DEFINE(NO_ZPIPE)) + + # Obtain compiler/linker options for dependencies + PKG_CHECK_MODULES(XPM, xproto x11) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 86f331b65a..766724fda9 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -10,6 +10,8 @@ XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING XLIB_LIBXPM_INSTALL_STAGING = YES +# we patch configure.ac +XLIB_LIBXPM_AUTORECONF = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \ host-gettext diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4f2eff20fd..cae3ba03db 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -59,7 +59,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ --disable-xnest --disable-xephyr --disable-dmx \ --with-builder-addr=buildroot@buildroot.org \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \ - --with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var \ + --with-fontrootdir=/usr/share/fonts/X11/ --localstatedir=/var \ --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y) @@ -127,6 +127,13 @@ endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) XSERVER_XORG_SERVER_DEPENDENCIES += udev XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev +# udev kms support depends on libdrm +ifeq ($(BR2_PACKAGE_LIBDRM),y) +XSERVER_XORG_SERVER_DEPENDENCIES += libdrm +XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev-kms +else +XSERVER_XORG_SERVER_CONF_OPT += --disable-config-udev-kms +endif else ifeq ($(BR2_PACKAGE_DBUS),y) XSERVER_XORG_SERVER_DEPENDENCIES += dbus diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in index 1e2f932ae8..4db73789a3 100644 --- a/package/xbmc/Config.in +++ b/package/xbmc/Config.in @@ -39,6 +39,7 @@ menuconfig BR2_PACKAGE_XBMC select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE_UCP select BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON_BSDDB select BR2_PACKAGE_PYTHON_BZIP2 @@ -70,6 +71,7 @@ if BR2_PACKAGE_XBMC config BR2_PACKAGE_XBMC_AVAHI bool "avahi" + depends on !BR2_PREFER_STATIC_LIB # avahi select BR2_PACKAGE_AVAHI select BR2_PACKAGE_AVAHI_DAEMON help diff --git a/package/zyre/Config.in b/package/zyre/Config.in index 5833ccc18c..31e1d6f0ae 100644 --- a/package/zyre/Config.in +++ b/package/zyre/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_ZYRE depends on BR2_LARGEFILE # filemq depends on BR2_USE_WCHAR # filemq depends on BR2_TOOLCHAIN_HAS_THREADS # filemq + depends on BR2_USE_MMU # filemq -> czmq # uClibc toolchains provided by ADI don't have AI_ADDRCONFIG # support, needed by filemq -> czmq depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \ @@ -17,6 +18,7 @@ config BR2_PACKAGE_ZYRE http://zyre.org comment "zyre needs a toolchain w/ C++, IPv6, largefile, wchar, threads" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \ !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \ |
