diff options
29 files changed, 192 insertions, 198 deletions
@@ -368,7 +368,7 @@ $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) % dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) -$(BASE_TARGETS): dirs $(O)/toolchainfile.cmake +$(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake $(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config $(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig @@ -377,7 +377,8 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL) -$(O)/toolchainfile.cmake: +$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: + mkdir -p $(@D) @echo -en "\ set(CMAKE_SYSTEM_NAME Linux)\n\ set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\ @@ -477,9 +478,16 @@ endif else \ /sbin/ldconfig -r $(TARGET_DIR); \ fi - echo $(BR2_VERSION_FULL) > $(TARGET_DIR)/etc/br-version + ( \ + echo "NAME=Buildroot"; \ + echo "VERSION=$(BR2_VERSION_FULL)"; \ + echo "ID=buildroot"; \ + echo "VERSION_ID=$(BR2_VERSION)"; \ + echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \ + ) > $(TARGET_DIR)/etc/os-release ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"") + @$(call MESSAGE,"Executing post-build script") $(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR) endif diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig new file mode 100644 index 000000000..ff3948b27 --- /dev/null +++ b/configs/mx53loco_defconfig @@ -0,0 +1,23 @@ +# Architecture +BR2_arm=y +BR2_cortex_a8=y +# BR2_SOFT_FLOAT is not set +BR2_VFP_FLOAT=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx53_loco" +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" +BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01" + +# filesystem +BR2_TARGET_ROOTFS_EXT2=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" +BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01" +BR2_LINUX_KERNEL_DEFCONFIG="imx5" diff --git a/package/Config.in b/package/Config.in index 8a7c9c4a5..41cbb8c1a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -344,6 +344,7 @@ source "package/jsmin/Config.in" endmenu menu "Networking" +source "package/glib-networking/Config.in" source "package/libcgi/Config.in" source "package/libcgicc/Config.in" source "package/libcurl/Config.in" diff --git a/package/Makefile.cmake.in b/package/Makefile.cmake.in index 4a4ad6e2d..1cd65e46f 100644 --- a/package/Makefile.cmake.in +++ b/package/Makefile.cmake.in @@ -72,7 +72,7 @@ define $(2)_CONFIGURE_CMDS (cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ $$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ - -DCMAKE_TOOLCHAIN_FILE="$$(BASE_DIR)/toolchainfile.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ $$($$(PKG)_CONF_OPT) \ ) diff --git a/package/Makefile.package.in b/package/Makefile.package.in index 33461b4dc..ea44c6cef 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -238,7 +238,7 @@ endef define DOWNLOAD_WGET test -e $(DL_DIR)/$(2) || \ - $(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2) + $(WGET) -O $(DL_DIR)/$(2) $(call qstrip,$(1))/$(2) endef define SOURCE_CHECK_WGET diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 739c5f281..339261480 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -10,7 +10,7 @@ # either version 2.1 of the License, or (at your option) any # later version. -AVAHI_VERSION = 0.6.30 +AVAHI_VERSION = 0.6.31 AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz AVAHI_SITE = http://www.avahi.org/download/ AVAHI_INSTALL_STAGING = YES diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 912deab6c..f3d44f6fa 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -12,9 +12,10 @@ E2FSPROGS_CONF_OPT = \ --enable-elf-shlibs \ $(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \ $(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \ + $(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \ $(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \ --disable-uuidd \ - --disable-blkid \ + --disable-libblkid \ --disable-libuuid \ --enable-fsck \ --disable-e2initrd-helper \ diff --git a/package/gamin/gamin-0.1.10-no-const-return.patch b/package/gamin/gamin-0.1.10-no-const-return.patch new file mode 100644 index 000000000..3e6e90521 --- /dev/null +++ b/package/gamin/gamin-0.1.10-no-const-return.patch @@ -0,0 +1,57 @@ +G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid +build failures. + +Upstream-Status: Pending + +Index: gamin-0.1.10/server/gam_node.c +=================================================================== +--- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314 +0100 ++++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100 +@@ -122,7 +122,7 @@ + * it has finished with the string. If it must keep it longer, it + * should makes its own copy. The returned string must not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_node_get_path(GamNode * node) + { + g_assert(node); +Index: gamin-0.1.10/server/gam_node.h +=================================================================== +--- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269 +0100 ++++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100 +@@ -58,7 +58,7 @@ + void gam_node_set_is_dir (GamNode *node, + gboolean is_dir); + +-G_CONST_RETURN char *gam_node_get_path (GamNode *node); ++const char *gam_node_get_path (GamNode *node); + + GList *gam_node_get_subscriptions (GamNode *node); + +Index: gamin-0.1.10/server/gam_subscription.c +=================================================================== +--- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12 15:25:40.497177525 +0100 ++++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304 +0100 +@@ -141,7 +141,7 @@ + * @param sub the GamSubscription + * @returns The path being monitored. It should not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_subscription_get_path(GamSubscription * sub) + { + if (sub == NULL) +Index: gamin-0.1.10/server/gam_subscription.h +=================================================================== +--- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12 15:25:28.507178266 +0100 ++++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285 +0100 +@@ -21,7 +21,7 @@ + + int gam_subscription_get_reqno (GamSubscription *sub); + +-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); ++const char *gam_subscription_get_path (GamSubscription *sub); + + GamListener *gam_subscription_get_listener (GamSubscription *sub); + diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in new file mode 100644 index 000000000..16f0d4a22 --- /dev/null +++ b/package/glib-networking/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_GLIB_NETWORKING + bool "glib-networking" + depends on BR2_USE_WCHAR # glib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + help + Network-related GIO modules for glib. + +comment "glib-networking requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk new file mode 100644 index 000000000..b1ad62110 --- /dev/null +++ b/package/glib-networking/glib-networking.mk @@ -0,0 +1,22 @@ +############################################################# +# +# glib-networking +# +############################################################# + +GLIB_NETWORKING_MAJOR_VERSION = 2.30 +GLIB_NETWORLING_MINOR_VERSION = 2 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORLING_MINOR_VERSION) +GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION) +GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz + +GLIB_NETWORKING_INSTALL_STAGING = YES + +GLIB_NETWORKING_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +GLIB_NETWORKING_DEPENDENCIES += gnutls +GLIB_NETWORKING_CONF_OPT = --with-libgcrypt-prefix=$(STAGING_DIR)/usr +endif + +$(eval $(call AUTOTARGETS)) diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 53b367641..c9e5d07bb 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -3,7 +3,7 @@ # libarchive (reusable C library for archive formats) # ############################################################# -LIBARCHIVE_VERSION = 2.8.4 +LIBARCHIVE_VERSION = 2.8.5 LIBARCHIVE_SITE = http://libarchive.googlecode.com/files/ LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.gz LIBARCHIVE_INSTALL_STAGING = YES diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 3d4243073..d1d7231b0 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_ZLIB depends on BR2_USE_WCHAR # gettext help diff --git a/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch b/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch deleted file mode 100644 index 39c051078..000000000 --- a/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001 -From: Lionel Landwerlin <llandwerlin@gmail.com> -Date: Sat, 6 Nov 2010 14:56:15 +0100 -Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers - -Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> ---- - glib/gatomic.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/glib/gatomic.c b/glib/gatomic.c -index 845c866..01468ce 100644 ---- a/glib/gatomic.c -+++ b/glib/gatomic.c -@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi - #endif /* DEFINE_WITH_WIN32_INTERLOCKED */ - - #ifdef DEFINE_WITH_MUTEXES -+# include "gthread.h" - /* We have to use the slow, but safe locking method */ - static GMutex *g_atomic_mutex; - --- -1.7.2.3 - diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 0832ac335..d2445a148 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -3,8 +3,8 @@ # libglib2 # ############################################################# -LIBGLIB2_VERSION_MAJOR = 2.28 -LIBGLIB2_VERSION_MINOR = 8 +LIBGLIB2_VERSION_MAJOR = 2.30 +LIBGLIB2_VERSION_MINOR = 2 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) @@ -13,7 +13,7 @@ LIBGLIB2_INSTALL_STAGING = YES LIBGLIB2_INSTALL_TARGET = YES LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install -LIBGLIB2_CONF_ENV = \ +LIBGLIB2_CONF_ENV = \ ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ glib_cv_uscore=no ac_cv_func_strtod=yes \ ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \ @@ -44,21 +44,28 @@ LIBGLIB2_CONF_ENV = \ ac_cv_func_posix_getgrgid_r=no \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) +# old uClibc versions don't provide qsort_r +ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) +LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no +else +LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes +endif + HOST_LIBGLIB2_CONF_OPT = \ --disable-gtk-doc \ --enable-debug=no \ -LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl) +LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl) -HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-zlib +HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib ifneq ($(BR2_ENABLE_LOCALE),y) -LIBGLIB2_DEPENDENCIES+=libiconv +LIBGLIB2_DEPENDENCIES += libiconv endif ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBGLIB2_CONF_OPT += --with-libiconv=gnu -LIBGLIB2_DEPENDENCIES+=libiconv +LIBGLIB2_DEPENDENCIES += libiconv endif define LIBGLIB2_REMOVE_DEV_FILES diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 347687cfe..eee6adecc 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBSOUP config BR2_PACKAGE_LIBSOUP_SSL bool "https support" + select BR2_PACKAGE_GLIB_NETWORKING select BR2_PACKAGE_GNUTLS depends on BR2_PACKAGE_LIBSOUP help diff --git a/package/libsoup/libsoup-CVE-2011-2054.patch b/package/libsoup/libsoup-CVE-2011-2054.patch deleted file mode 100644 index 0dc5eccf9..000000000 --- a/package/libsoup/libsoup-CVE-2011-2054.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4617b6ef6dd21931a0153070c5b5ff7ef21b46f8 Mon Sep 17 00:00:00 2001 -From: Dan Winship <danw@gnome.org> -Date: Wed, 29 Jun 2011 10:04:06 -0400 -Subject: [PATCH] SoupServer: fix to not allow smuggling ".." into path - -When SoupServer:raw-paths was set (the default), it was possible to -sneak ".." segments into the path passed to the SoupServerHandler, -which could then end up tricking some handlers into retrieving -arbitrary files from the filesystem. Fix that. - -https://bugzilla.gnome.org/show_bug.cgi?id=653258 - -diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c -index d56efd1..7225337 100644 ---- a/libsoup/soup-server.c -+++ b/libsoup/soup-server.c -@@ -779,6 +779,15 @@ got_headers (SoupMessage *req, SoupClientContext *client) - - uri = soup_message_get_uri (req); - decoded_path = soup_uri_decode (uri->path); -+ -+ if (strstr (decoded_path, "/../") || -+ g_str_has_suffix (decoded_path, "/..")) { -+ /* Introducing new ".." segments is not allowed */ -+ g_free (decoded_path); -+ soup_message_set_status (req, SOUP_STATUS_BAD_REQUEST); -+ return; -+ } -+ - soup_uri_set_path (uri, decoded_path); - g_free (decoded_path); - } diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 147b220a2..657258506 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,10 +4,11 @@ # ############################################################# -LIBSOUP_MAJOR_VERSION:=2.32 -LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2 -LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2 -LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION) +LIBSOUP_MAJOR_VERSION = 2.36 +LIBSOUP_MINOR_VERSION = 1 +LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).$(LIBSOUP_MINOR_VERSION) +LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.bz2 +LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION) LIBSOUP_INSTALL_STAGING = YES LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) @@ -16,18 +17,14 @@ ifneq ($(BR2_INET_IPV6),y) LIBSOUP_CONF_ENV += soup_cv_ipv6=no endif -LIBSOUP_CONF_OPT = \ - --disable-explicit-deps \ - --disable-glibtest \ - --without-gnome +LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y) -LIBSOUP_DEPENDENCIES += gnutls -LIBSOUP_CONF_OPT += --enable-ssl --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBSOUP_DEPENDENCIES += glib-networking else -LIBSOUP_CONF_OPT += --disable-ssl +LIBSOUP_CONF_OPT += --disable-tls-check endif $(eval $(call AUTOTARGETS)) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 9ce1a75d8..b15896ca5 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -8,6 +8,15 @@ config BR2_PACKAGE_LINUX_FIRMWARE if BR2_PACKAGE_LINUX_FIRMWARE +menu "Atheros" + +config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271 + bool "Atheros 9271" + help + Firmware files for the Atheros 9271 module + +endmenu + menu "Ralink" config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index d5987ab6c..eedef2f78 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -21,6 +21,10 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX) += \ rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin \ LICENCE.ralink-firmware.txt +# ar9271 +LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271) += \ + LICENCE.atheros_firmware ar9271.fw + # wl127x LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \ ti-connectivity/wl1271-fw-2.bin \ diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 1dabedf46..30e95b457 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -9,7 +9,7 @@ LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y) - LUA_MYCFLAGS += -fPIC -DLUA_USE_DLOPEN + LUA_MYCFLAGS += -fPIC LUA_MYLIBS += -ldl endif @@ -18,7 +18,7 @@ ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y) LUA_MYLIBS += -lreadline -lhistory -lncurses LUA_MYCFLAGS += -DLUA_USE_LINUX else - LUA_MYCFLAGS += -DLUA_USE_POSIX + LUA_MYCFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN endif HOST_LUA_DEPENDENCIES = diff --git a/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch b/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch deleted file mode 100644 index 934c332f4..000000000 --- a/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp 2010-09-10 11:05:22.000000000 +0200 -+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp 2010-11-15 16:39:53.000000000 +0100 -@@ -70,6 +70,19 @@ - #endif - #include <unistd.h> - -+#if defined(__UCLIBC__) -+// versions of uClibc 0.9.32 with linuxthreads.old and below do not have -+// pthread_getattr_np or pthread_attr_getstack. -+#if __UCLIBC_MAJOR__ == 0 && \ -+ (__UCLIBC_MINOR__ < 9 || \ -+ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \ -+ defined(__LINUXTHREADS_OLD__) -+#define UCLIBC_USE_PROC_SELF_MAPS 1 -+#include <stdio_ext.h> -+extern int* __libc_stack_end; -+#endif -+#endif -+ - #if OS(SOLARIS) - #include <thread.h> - #else -@@ -580,6 +592,37 @@ - get_thread_info(find_thread(NULL), &threadInfo); - return threadInfo.stack_end; - #elif OS(UNIX) -+#ifdef UCLIBC_USE_PROC_SELF_MAPS -+ // Read /proc/self/maps and locate the line whose address -+ // range contains __libc_stack_end. -+ FILE* file = fopen("/proc/self/maps", "r"); -+ if (!file) -+ return 0; -+ __fsetlocking(file, FSETLOCKING_BYCALLER); -+ char* line = 0; -+ size_t lineLen = 0; -+ while (!feof_unlocked(file)) { -+ if (getdelim(&line, &lineLen, '\n', file) <= 0) -+ break; -+ -+ long from; -+ long to; -+ if (sscanf (line, "%lx-%lx", &from, &to) != 2) -+ continue; -+ if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) { -+ fclose(file); -+ free(line); -+#ifdef _STACK_GROWS_UP -+ return (void *)from; -+#else -+ return (void *)to; -+#endif -+ } -+ } -+ fclose(file); -+ free(line); -+ return 0; -+#else - AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); - MutexLocker locker(mutex); - static void* stackBase = 0; -@@ -603,6 +646,7 @@ - stackThread = thread; - } - return static_cast<char*>(stackBase) + stackSize; -+#endif - #elif OS(WINCE) - AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); - MutexLocker locker(mutex); diff --git a/package/qt/qt-4.7.4-configure.patch b/package/qt/qt-configure.patch index cef53e3fa..cef53e3fa 100644 --- a/package/qt/qt-4.7.4-configure.patch +++ b/package/qt/qt-configure.patch diff --git a/package/qt/qt-4.7.4-pthread_getattr_np.patch b/package/qt/qt-pthread_getattr_np.patch index 4b20bb232..4b20bb232 100644 --- a/package/qt/qt-4.7.4-pthread_getattr_np.patch +++ b/package/qt/qt-pthread_getattr_np.patch diff --git a/package/qt/qt-4.7.4-script-qtdbus-no-gui.patch b/package/qt/qt-script-qtdbus-no-gui.patch index e29e9e4a1..e29e9e4a1 100644 --- a/package/qt/qt-4.7.4-script-qtdbus-no-gui.patch +++ b/package/qt/qt-script-qtdbus-no-gui.patch diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 34f05f925..776eb63af 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -12,7 +12,7 @@ # ###################################################################### -QT_VERSION = 4.7.4 +QT_VERSION = 4.8.0 QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz QT_SITE = http://get.qt.nokia.com/qt/source QT_DEPENDENCIES = host-pkg-config @@ -59,7 +59,10 @@ endif # ensure glib is built first if enabled for Qt's glib support ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +QT_CONFIGURE_OPTS += -glib QT_DEPENDENCIES += libglib2 +else +QT_CONFIGURE_OPTS += -no-glib endif @@ -196,19 +199,20 @@ else QT_CONFIGURE_OPTS += -big-endian endif -ifeq ($(BR2_arm),y) -QT_EMB_PLATFORM = arm -else ifeq ($(BR2_armeb),y) +ifeq ($(BR2_arm)$(BR2_armeb),y) QT_EMB_PLATFORM = arm +ifeq ($(BR2_GCC_VERSION_4_6_X),y) +# workaround for gcc issue +# http://gcc.gnu.org/ml/gcc-patches/2010-11/msg02245.html +QT_CXXFLAGS += -fno-strict-volatile-bitfields +endif else ifeq ($(BR2_avr32),y) QT_EMB_PLATFORM = avr32 else ifeq ($(BR2_i386),y) QT_EMB_PLATFORM = x86 else ifeq ($(BR2_x86_64),y) QT_EMB_PLATFORM = x86_64 -else ifeq ($(BR2_mips),y) -QT_EMB_PLATFORM = mips -else ifeq ($(BR2_mipsel),y) +else ifeq ($(BR2_mips)$(BR2_mipsel),y) QT_EMB_PLATFORM = mips else ifeq ($(BR2_powerpc),y) QT_EMB_PLATFORM = powerpc @@ -222,9 +226,7 @@ ifneq ($(BR2_PACKAGE_QT_GUI_MODULE),y) QT_CONFIGURE_OPTS += -no-gui endif -ifeq ($(BR2_PACKAGE_QT_GIF),y) -QT_CONFIGURE_OPTS += -qt-gif -else +ifneq ($(BR2_PACKAGE_QT_GIF),y) QT_CONFIGURE_OPTS += -no-gif endif @@ -490,9 +492,6 @@ define QT_CONFIGURE_CMDS $(if $(VERBOSE),-verbose,-silent) \ -force-pkg-config \ $(QT_CONFIGURE_OPTS) \ - -no-gfx-qnx \ - -no-kbd-qnx \ - -no-mouse-qnx \ -no-xinerama \ -no-cups \ -no-nis \ @@ -507,7 +506,7 @@ define QT_CONFIGURE_CMDS endef define QT_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk index bc99f6ce5..4992b8c50 100644 --- a/package/sdl_net/sdl_net.mk +++ b/package/sdl_net/sdl_net.mk @@ -3,8 +3,9 @@ # SDL_net: network addon for SDL # ############################################################# -SDL_NET_VERSION:=1.2.7 -SDL_NET_SITE:=http://www.libsdl.org/projects/SDL_net/release +SDL_NET_VERSION = 1.2.8 +SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release +SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz SDL_NET_CONF_OPT = --localstatedir=/var \ --with-sdl-prefix=$(STAGING_DIR)/usr \ diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 52a85102c..a3ad03776 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ############################################################# VALA_VERSION_MAJOR = 0.15 -VALA_VERSION_MINOR = 1 +VALA_VERSION_MINOR = 2 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR) VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz diff --git a/package/zlib/zlib-1.2.5-fix-static-install.patch b/package/zlib/zlib-1.2.5-fix-static-install.patch deleted file mode 100644 index 0a885f742..000000000 --- a/package/zlib/zlib-1.2.5-fix-static-install.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] fix make install for static builds - -Only try to install shared lib if we've built one. - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - Makefile.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -Index: zlib-1.2.5/Makefile.in -=================================================================== ---- zlib-1.2.5.orig/Makefile.in -+++ zlib-1.2.5/Makefile.in -@@ -168,7 +168,9 @@ install-libs: $(LIBS) - -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi - -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi - cp $(STATICLIB) $(DESTDIR)$(libdir) -- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) -+ if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ -+ cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ -+ fi - cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) - -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 - -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index fbe923e69..eca98b876 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -3,10 +3,11 @@ # zlib # ############################################################# -ZLIB_VERSION:=1.2.5 -ZLIB_SOURCE:=zlib-$(ZLIB_VERSION).tar.bz2 -ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng -ZLIB_INSTALL_STAGING=YES + +ZLIB_VERSION = 1.2.6 +ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2 +ZLIB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng +ZLIB_INSTALL_STAGING = YES ifeq ($(BR2_PREFER_STATIC_LIB),y) ZLIB_PIC := |