From: <abe...@us...> - 2016-02-27 23:30:34
|
Revision: 7564 http://sourceforge.net/p/astlinux/code/7564 Author: abelbeck Date: 2016-02-27 23:30:31 +0000 (Sat, 27 Feb 2016) Log Message: ----------- add qemu package, a favor for David Kerr for a project he is working on Modified Paths: -------------- branches/1.0/astlinux-ast11.config branches/1.0/astlinux-ast13.config branches/1.0/astlinux18.config branches/1.0/initrd.config branches/1.0/package/Config.in branches/1.0/package/libffi/libffi.mk branches/1.0/package/libglib2/Config.in branches/1.0/package/libglib2/libglib2.mk branches/1.0/package/pixman/pixman.mk branches/1.0/runnix-iso.config branches/1.0/runnix.config branches/1.0/x86_64-configs/astlinux-ast11.config branches/1.0/x86_64-configs/astlinux-ast13.config branches/1.0/x86_64-configs/astlinux18.config branches/1.0/x86_64-configs/initrd.config Added Paths: ----------- branches/1.0/package/libffi/libffi-0001-Fix-installation-location-of-libffi.patch branches/1.0/package/libglib2/libglib2-0001-fix-compile-time-atomic-detection.patch branches/1.0/package/libglib2/libglib2-0002-disable-tests.patch branches/1.0/package/pixman/pixman-0001-Disable-tests.patch branches/1.0/package/pixman/pixman-0002-pixman-private-include-float.h-only-in-C-code.patch branches/1.0/package/qemu/ branches/1.0/package/qemu/Config.in branches/1.0/package/qemu/qemu.mk Removed Paths: ------------- branches/1.0/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch branches/1.0/package/libglib2/libglib2-optional-ipv6.patch branches/1.0/package/pixman/pixman-0.10.0-no-tests.patch Modified: branches/1.0/astlinux-ast11.config =================================================================== --- branches/1.0/astlinux-ast11.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/astlinux-ast11.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:26 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:06:59 2016 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -670,6 +670,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/astlinux-ast13.config =================================================================== --- branches/1.0/astlinux-ast13.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/astlinux-ast13.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:26 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:06:59 2016 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -670,6 +670,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/astlinux18.config =================================================================== --- branches/1.0/astlinux18.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/astlinux18.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:26 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:06:59 2016 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -670,6 +670,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/initrd.config =================================================================== --- branches/1.0/initrd.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/initrd.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:26 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:06:59 2016 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -550,6 +550,7 @@ # # BR2_PACKAGE_HTPASSWD is not set # BR2_PACKAGE_MAC2VENDOR is not set +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # BR2_PACKAGE_ZONEINFO is not set Modified: branches/1.0/package/Config.in =================================================================== --- branches/1.0/package/Config.in 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/package/Config.in 2016-02-27 23:30:31 UTC (rev 7564) @@ -435,6 +435,7 @@ menu "Miscellaneous" source "package/htpasswd/Config.in" source "package/mac2vendor/Config.in" +source "package/qemu/Config.in" source "package/shared-mime-info/Config.in" source "package/zoneinfo/Config.in" endmenu Added: branches/1.0/package/libffi/libffi-0001-Fix-installation-location-of-libffi.patch =================================================================== --- branches/1.0/package/libffi/libffi-0001-Fix-installation-location-of-libffi.patch (rev 0) +++ branches/1.0/package/libffi/libffi-0001-Fix-installation-location-of-libffi.patch 2016-02-27 23:30:31 UTC (rev 7564) @@ -0,0 +1,54 @@ +From 580f46a7bc6e9fea3a2227b5268cc3aed1d60e3b Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <tho...@fr...> +Date: Thu, 7 Feb 2013 22:26:56 +0100 +Subject: [PATCH] Fix installation location of libffi +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The libffi is currently declared as toolexeclib_LTLIBRARIES. In many +cases, toolexeclib libraries will be installed in /usr/lib, so it +doesn't make any difference. + +However, with multilib toolchains, they get installed in a +subdirectory of /usr/lib/. For example, with a Sourcery CodeBench +PowerPC toolchain, if the e500mc multilib variant is used, the libffi +library gets installed in /usr/lib/te500mc/. This is due to the +following code in the configure script: + + multi_os_directory=`$CC -print-multi-os-directory` + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; + esac + +Once the library is installed in /usr/lib/te500mc/, nothing works +because this installation location is inconsistent with the +installation location declared in libffi.pc. + +So, instead of using this bizarre toolexeclib_LTLIBRARIES, simply use +the more standard lib_LTLIBRARIES, which ensures that the libffi +library is always installed in /usr/lib. + +Signed-off-by: Thomas Petazzoni <tho...@fr...> +[unfuzz for 3.2.1] +Signed-off-by: Jörg Krause <joe...@em...cks> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 0e40451..309474c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -104,7 +104,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) + + MAKEOVERRIDES= + +-toolexeclib_LTLIBRARIES = libffi.la ++lib_LTLIBRARIES = libffi.la + noinst_LTLIBRARIES = libffi_convenience.la + + libffi_la_SOURCES = src/prep_cif.c src/types.c \ +-- +2.5.3 Modified: branches/1.0/package/libffi/libffi.mk =================================================================== --- branches/1.0/package/libffi/libffi.mk 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/package/libffi/libffi.mk 2016-02-27 23:30:31 UTC (rev 7564) @@ -4,30 +4,33 @@ # ############################################################# -LIBFFI_VERSION = 3.0.9 -LIBFFI_SITE = ftp://sources.redhat.com/pub/libffi/ +LIBFFI_VERSION = 3.2.1 +LIBFFI_SITE = ftp://sourceware.org/pub/libffi LIBFFI_INSTALL_STAGING = YES +LIBFFI_AUTORECONF = YES # Move the headers to the usual location, and adjust the .pc file # accordingly -define LIBFFI_MOVE_STAGING_HEADERS - mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/ - sed -i '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc - rm -rf $(TARGET_DIR)/usr/lib/libffi-* +define LIBFFI_MOVE_HEADERS + mv $(1)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(1)/usr/include/ + $(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \ + $(1)/usr/lib/pkgconfig/libffi.pc + rm -rf $(1)/usr/lib/libffi-* endef +LIBFFI_MOVE_STAGING_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(STAGING_DIR)) LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS -# Similar for target headers -define LIBFFI_MOVE_TARGET_HEADERS - install -d $(TARGET_DIR)/usr/include/ - mv $(TARGET_DIR)/usr/lib/libffi-*/include/*.h $(TARGET_DIR)/usr/include/ - sed -i '/^includedir.*/d' $(TARGET_DIR)/usr/lib/pkgconfig/libffi.pc - rm -rf $(TARGET_DIR)/usr/lib/libffi-* +HOST_LIBFFI_MOVE_HOST_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(HOST_DIR)) +HOST_LIBFFI_POST_INSTALL_HOOKS += HOST_LIBFFI_MOVE_HOST_HEADERS + +# Remove headers that are not at the usual location from the target +define LIBFFI_REMOVE_TARGET_HEADERS + rm -rf $(TARGET_DIR)/usr/lib/libffi-$(LIBFFI_VERSION) endef -LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS +LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_REMOVE_TARGET_HEADERS $(eval $(call AUTOTARGETS,package,libffi)) - +$(eval $(call AUTOTARGETS,package,libffi,host)) Modified: branches/1.0/package/libglib2/Config.in =================================================================== --- branches/1.0/package/libglib2/Config.in 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/package/libglib2/Config.in 2016-02-27 23:30:31 UTC (rev 7564) @@ -3,6 +3,7 @@ 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 Added: branches/1.0/package/libglib2/libglib2-0001-fix-compile-time-atomic-detection.patch =================================================================== --- branches/1.0/package/libglib2/libglib2-0001-fix-compile-time-atomic-detection.patch (rev 0) +++ branches/1.0/package/libglib2/libglib2-0001-fix-compile-time-atomic-detection.patch 2016-02-27 23:30:31 UTC (rev 7564) @@ -0,0 +1,27 @@ +[PATCH] Fix compilation issues on architectures with limited atomic support + +Improved compile-time detection of atomic support in the compiler. + +Upstream-Status: submitted +See : https://bugzilla.gnome.org/show_bug.cgi?id=752731 + +Signed-off-by: Brendan Heading <bre...@gm...> +--- + glib/gthread-posix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c +index ae5d805..8db8557 100644 +--- a/glib/gthread-posix.c ++++ b/glib/gthread-posix.c +@@ -67,7 +67,7 @@ + #endif + + /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */ +-#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && !defined(__clang__) ++#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__clang__) + #define USE_NATIVE_MUTEX + #endif + +-- +2.4.3 Added: branches/1.0/package/libglib2/libglib2-0002-disable-tests.patch =================================================================== --- branches/1.0/package/libglib2/libglib2-0002-disable-tests.patch (rev 0) +++ branches/1.0/package/libglib2/libglib2-0002-disable-tests.patch 2016-02-27 23:30:31 UTC (rev 7564) @@ -0,0 +1,43 @@ +Disable tests, some of them need python and sometimes host-python +gets mixed with distro python leading to build failures. + +Signed-off-by: Gustavo Zacarias <gus...@fr...> + +diff -Nura glib-2.46.1.orig/gio/Makefile.am glib-2.46.1/gio/Makefile.am +--- glib-2.46.1.orig/gio/Makefile.am 2015-10-20 16:59:03.042212468 -0300 ++++ glib-2.46.1/gio/Makefile.am 2015-10-20 17:32:26.763146133 -0300 +@@ -233,7 +233,7 @@ + platform_deps += win32/libgiowin32.la + endif + +-SUBDIRS += . tests ++SUBDIRS += . + + if HAVE_FAM + SUBDIRS += fam +diff -Nura glib-2.46.1.orig/glib/Makefile.am glib-2.46.1/glib/Makefile.am +--- glib-2.46.1.orig/glib/Makefile.am 2015-10-20 16:59:03.066213318 -0300 ++++ glib-2.46.1/glib/Makefile.am 2015-10-20 17:33:23.537155988 -0300 +@@ -33,8 +33,8 @@ + MAYBE_PCRE = pcre + endif + +-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests +-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests ++SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . ++DIST_SUBDIRS = libcharset gnulib pcre update-pcre + + AM_CPPFLAGS = \ + $(glib_INCLUDES) \ +diff -Nura glib-2.46.1.orig/Makefile.am glib-2.46.1/Makefile.am +--- glib-2.46.1.orig/Makefile.am 2015-10-20 16:59:03.003211087 -0300 ++++ glib-2.46.1/Makefile.am 2015-10-20 17:32:20.923939420 -0300 +@@ -6,7 +6,7 @@ + + ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} + +-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests ++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs + DIST_SUBDIRS = $(SUBDIRS) build + + bin_SCRIPTS = glib-gettextize Deleted: branches/1.0/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch =================================================================== --- branches/1.0/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,25 +0,0 @@ -From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001 -From: Lionel Landwerlin <lla...@gm...> -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 <lla...@gm...> ---- - 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 - Deleted: branches/1.0/package/libglib2/libglib2-optional-ipv6.patch =================================================================== --- branches/1.0/package/libglib2/libglib2-optional-ipv6.patch 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/package/libglib2/libglib2-optional-ipv6.patch 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,53 +0,0 @@ -[PATCH]: fix build on uClibc without IPv6 support - -Signed-off-by: Peter Korsgaard <ja...@su...> ---- - gio/ginetaddress.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -Index: glib-2.26.0/gio/ginetaddress.c -=================================================================== ---- glib-2.26.0.orig/gio/ginetaddress.c -+++ glib-2.26.0/gio/ginetaddress.c -@@ -21,6 +21,7 @@ - * Samuel Cormier-Iijima <sci...@gm...> - */ - -+#include <features.h> - #include <config.h> - - #include <string.h> -@@ -434,7 +435,11 @@ - return NULL; - } - -+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__) -+#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET) -+#else - #define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6) -+#endif - - /** - * g_inet_address_new_from_bytes: -@@ -483,8 +488,10 @@ - - return g_inet_address_new_from_bytes (addr, family); - } -+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)) - else - return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family); -+#endif - } - - /** -@@ -510,8 +517,10 @@ - - return g_inet_address_new_from_bytes (addr, family); - } -+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)) - else - return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family); -+#endif - } - - Modified: branches/1.0/package/libglib2/libglib2.mk =================================================================== --- branches/1.0/package/libglib2/libglib2.mk 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/package/libglib2/libglib2.mk 2016-02-27 23:30:31 UTC (rev 7564) @@ -3,64 +3,104 @@ # libglib2 # ############################################################# -LIBGLIB2_VERSION_MAJOR = 2.28 -LIBGLIB2_VERSION_MINOR = 8 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) -LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2 +LIBGLIB2_VERSION_MAJOR = 2.46 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 +LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) 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 = \ - 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 \ - ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \ - ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \ - ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \ - ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \ - ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \ - vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \ - jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \ - ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \ - ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \ - ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \ - ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no \ - jm_cv_func_gettimeofday_clobber=no \ - gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \ - utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \ - gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \ - am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \ - gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \ - ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \ - ac_use_included_regex=no gl_cv_c_restrict=no \ - ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \ - ac_cv_func_posix_getgrgid_r=no \ - gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) +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 \ + ac_cv_func_closedir_void=no \ + ac_cv_func_getloadavg=no \ + ac_cv_lib_util_getloadavg=no \ + ac_cv_lib_getloadavg_getloadavg=no \ + ac_cv_func_getgroups=yes \ + ac_cv_func_getgroups_works=yes \ + ac_cv_func_chown_works=yes \ + ac_cv_have_decl_euidaccess=no \ + ac_cv_func_euidaccess=no \ + ac_cv_have_decl_strnlen=yes \ + ac_cv_func_strnlen_working=yes \ + ac_cv_func_lstat_dereferences_slashed_symlink=yes \ + ac_cv_func_lstat_empty_string_bug=no \ + ac_cv_func_stat_empty_string_bug=no \ + vb_cv_func_rename_trailing_slash_bug=no \ + ac_cv_have_decl_nanosleep=yes \ + jm_cv_func_nanosleep_works=yes \ + gl_cv_func_working_utimes=yes \ + ac_cv_func_utime_null=yes \ + ac_cv_have_decl_strerror_r=yes \ + ac_cv_func_strerror_r_char_p=no \ + jm_cv_func_svid_putenv=yes \ + ac_cv_func_getcwd_null=yes \ + ac_cv_func_getdelim=yes \ + ac_cv_func_mkstemp=yes \ + utils_cv_func_mkstemp_limitations=no \ + utils_cv_func_mkdir_trailing_slash_bug=no \ + jm_cv_func_gettimeofday_clobber=no \ + gl_cv_func_working_readdir=yes \ + jm_ac_cv_func_link_follows_symlink=no \ + utils_cv_localtime_cache=no \ + ac_cv_struct_st_mtim_nsec=no \ + gl_cv_func_tzset_clobber=no \ + gl_cv_func_getcwd_null=yes \ + gl_cv_func_getcwd_path_max=yes \ + ac_cv_func_fnmatch_gnu=yes \ + am_getline_needs_run_time_check=no \ + am_cv_func_working_getline=yes \ + gl_cv_func_mkdir_trailing_slash_bug=no \ + gl_cv_func_mkstemp_limitations=no \ + ac_cv_func_working_mktime=yes \ + jm_cv_func_working_re_compile_pattern=yes \ + ac_use_included_regex=no \ + gl_cv_c_restrict=no \ + ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal \ + ac_cv_prog_F77=no \ + ac_cv_func_posix_getgrgid_r=no \ + glib_cv_long_long_format=ll \ + ac_cv_func_printf_unix98=yes \ + ac_cv_func_vsnprintf_c99=yes \ + ac_cv_func_newlocale=no \ + ac_cv_func_uselocale=no \ + ac_cv_func_strtod_l=no \ + ac_cv_func_strtoll_l=no \ + ac_cv_func_strtoull_l=no \ + gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) HOST_LIBGLIB2_CONF_OPT = \ - --disable-gtk-doc \ - --enable-debug=no \ + --disable-coverage \ + --disable-dtrace \ + --disable-fam \ + --disable-libelf \ + --disable-selinux \ + --disable-systemtap \ + --disable-xattr -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 +LIBGLIB2_CONF_OPT += --disable-libelf + ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBGLIB2_CONF_OPT += --with-libiconv=gnu -LIBGLIB2_DEPENDENCIES+=libiconv +LIBGLIB2_DEPENDENCIES += libiconv endif +LIBGLIB2_CONF_OPT += --with-pcre=internal + define LIBGLIB2_REMOVE_DEV_FILES rm -rf $(TARGET_DIR)/usr/lib/glib-2.0 rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gettext @@ -68,9 +108,7 @@ rm -f $(addprefix $(TARGET_DIR)/usr/bin/,glib-genmarshal glib-gettextize glib-mkenums gobject-query gtester gtester-report) endef -ifneq ($(BR2_HAVE_DEVFILES),y) LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_DEV_FILES -endif define LIBGLIB2_REMOVE_GDB_FILES rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gdb Deleted: branches/1.0/package/pixman/pixman-0.10.0-no-tests.patch =================================================================== --- branches/1.0/package/pixman/pixman-0.10.0-no-tests.patch 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/package/pixman/pixman-0.10.0-no-tests.patch 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,11 +0,0 @@ ---- a/Makefile.in.orig 2008-05-23 14:04:37.000000000 +0000 -+++ b/Makefile.in 2008-05-23 14:04:50.000000000 +0000 -@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = pixman test -+SUBDIRS = pixman - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = pixman-1.pc - USERNAME = $$USER Added: branches/1.0/package/pixman/pixman-0001-Disable-tests.patch =================================================================== --- branches/1.0/package/pixman/pixman-0001-Disable-tests.patch (rev 0) +++ branches/1.0/package/pixman/pixman-0001-Disable-tests.patch 2016-02-27 23:30:31 UTC (rev 7564) @@ -0,0 +1,28 @@ +From 9b8132738c364fc3c886e81e7d383aaff80dc867 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" <yan...@fr...> +Date: Sat, 5 Dec 2015 12:00:53 +0100 +Subject: [PATCH] Disable tests + +Tests are causing build failures on some architectures that are missing +a proper fenv.h, so just disable them. + +Signed-off-by: "Yann E. MORIN" <yan...@fr...> + +--- +Status: Buildroot specific, not suitable for upstream in this state. +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 5137c9e..eae79fd 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = pixman demos test ++SUBDIRS = pixman demos + + pkgconfigdir=$(libdir)/pkgconfig + pkgconfig_DATA=pixman-1.pc +-- +1.9.1 Added: branches/1.0/package/pixman/pixman-0002-pixman-private-include-float.h-only-in-C-code.patch =================================================================== --- branches/1.0/package/pixman/pixman-0002-pixman-private-include-float.h-only-in-C-code.patch (rev 0) +++ branches/1.0/package/pixman/pixman-0002-pixman-private-include-float.h-only-in-C-code.patch 2016-02-27 23:30:31 UTC (rev 7564) @@ -0,0 +1,45 @@ +From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <tho...@fr...> +Date: Sun, 17 Jan 2016 14:14:28 +0100 +Subject: [PATCH] pixman-private: include <float.h> only in C code + +<float.h> is included unconditionally by pixman-private.h, which in +turn gets included by assembler files. Unfortunately, with certain C +libraries (like the musl C library), <float.h> cannot be included in +assembler files: + + CCLD libpixman-arm-simd.la +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' + +It turns out however that <float.h> is not needed by assembly files, +so we move its inclusion within the #ifndef __ASSEMBLER__ condition, +which solves the problem. + +Signed-off-by: Thomas Petazzoni <tho...@fr...> +--- + pixman/pixman-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 73108a0..73a5414 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -1,5 +1,3 @@ +-#include <float.h> +- + #ifndef PIXMAN_PRIVATE_H + #define PIXMAN_PRIVATE_H + +@@ -30,6 +28,7 @@ + #include <stdio.h> + #include <string.h> + #include <stddef.h> ++#include <float.h> + + #include "pixman-compiler.h" + +-- +2.6.4 Modified: branches/1.0/package/pixman/pixman.mk =================================================================== --- branches/1.0/package/pixman/pixman.mk 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/package/pixman/pixman.mk 2016-02-27 23:30:31 UTC (rev 7564) @@ -3,11 +3,19 @@ # pixman # ################################################################################ -PIXMAN_VERSION = 0.17.6 -PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz -PIXMAN_SITE = http://cairographics.org/releases/ -PIXMAN_AUTORECONF = NO + +PIXMAN_VERSION = 0.34.0 +PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2 +PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib + PIXMAN_INSTALL_STAGING = YES +PIXMAN_DEPENDENCIES = host-pkg-config +# For 0001-Disable-tests.patch +PIXMAN_AUTORECONF = YES + +# don't build gtk based demos +PIXMAN_CONF_OPT = --disable-gtk + $(eval $(call AUTOTARGETS,package,pixman)) $(eval $(call AUTOTARGETS,package,pixman,host)) Added: branches/1.0/package/qemu/Config.in =================================================================== --- branches/1.0/package/qemu/Config.in (rev 0) +++ branches/1.0/package/qemu/Config.in 2016-02-27 23:30:31 UTC (rev 7564) @@ -0,0 +1,98 @@ +comment "QEMU requires a toolchain with wchar, threads" + depends on BR2_USE_MMU + depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) + +config BR2_PACKAGE_QEMU + bool "QEMU" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR # gettext + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + QEMU is a generic and open source machine emulator and virtualizer. + + When used as a machine emulator, QEMU can run OSes and programs made + for one machine (e.g. an ARM board) on a different machine (e.g. + your own PC). By using dynamic translation, it achieves very good + performance. + + When used as a virtualizer, QEMU achieves near native performances + by executing the guest code directly on the host CPU. QEMU supports + virtualization when executing under the Xen hypervisor or using the + KVM kernel module in Linux. When using KVM, QEMU can virtualize x86, + server and embedded PowerPC, and S390 guests. + + http://qemu.org/ + +if BR2_PACKAGE_QEMU + +comment "QEMU Emulators selection" + +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS + string "Enable specific targets" + default "x86_64-softmmu" + help + Enter here the list of QEMU targets you want to build. For example: + + System emulation | User-land emulation + ----------------------+----------------------- + i386-softmmu | i386-linux-user + arm-softmmu | ppc-linux-user + x86_64-softmmu | sparc-bsd-user + ... | ... + +config QEMU_FOO + bool # To break the indentation + +if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" + +comment "... or you can select emulator families to enable, below:" + +config BR2_PACKAGE_QEMU_SYSTEM + bool "Enable all systems emulation" + help + Say 'y' to build all system emulators/virtualisers that QEMU supports. + +config BR2_PACKAGE_QEMU_LINUX_USER + bool "Enable all Linux user-land emulation" + help + Say 'y' to build all Linux user-land emulators that QEMU supports. + +# Note: bsd-user can not be build on Linux + +endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == "" + +config BR2_PACKAGE_QEMU_HAS_EMULS + def_bool y + depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" + +if BR2_PACKAGE_QEMU_HAS_EMULS + +comment "QEMU Frontends" + +config BR2_PACKAGE_QEMU_SDL + bool "Enable SDL frontend" + select BR2_PACKAGE_SDL + help + Say 'y' to enable the SDL frontend, that is, a graphical window + presenting the VM's display. + +endif # BR2_PACKAGE_QEMU_HAS_EMULS + +comment "QEMU System Options" + +config BR2_PACKAGE_QEMU_SYSTEM_TOOLS + bool "Enable system tools" + help + Say 'y' to build qemu-img, qemu-nbd and qemu-io tools. + +config BR2_PACKAGE_QEMU_SYSTEM_VNC + bool "Enable system VNC" + help + Say 'y' to build VNC display. + +endif # BR2_PACKAGE_QEMU Added: branches/1.0/package/qemu/qemu.mk =================================================================== --- branches/1.0/package/qemu/qemu.mk (rev 0) +++ branches/1.0/package/qemu/qemu.mk 2016-02-27 23:30:31 UTC (rev 7564) @@ -0,0 +1,116 @@ +################################################################################ +# +# qemu +# +################################################################################ + +QEMU_VERSION = 2.5.0 +QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2 +QEMU_SITE = http://wiki.qemu.org/download + +QEMU_DEPENDENCIES = host-pkg-config libglib2 zlib pixman util-linux + +# Need the LIBS variable because librt and libm are +# not automatically pulled. :-( +QEMU_LIBS = -lrt -lm + +QEMU_OPTS = + +QEMU_VARS = \ + LIBTOOL=$(HOST_DIR)/usr/bin/libtool + +# If we want to specify only a subset of targets, we must still enable all +# of them, so that QEMU properly builds its list of default targets, from +# which it then checks if the specified sub-set is valid. That's what we +# do in the first part of the if-clause. +# Otherwise, if we do not want to pass a sub-set of targets, we then need +# to either enable or disable -user and/or -system emulation appropriately. +# That's what we do in the else-clause. +ifneq ($(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS)),) +QEMU_OPTS += --enable-system --enable-linux-user +QEMU_OPTS += --target-list="$(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS))" +else + +ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) +QEMU_OPTS += --enable-system +else +QEMU_OPTS += --disable-system +endif + +ifeq ($(BR2_PACKAGE_QEMU_LINUX_USER),y) +QEMU_OPTS += --enable-linux-user +else +QEMU_OPTS += --disable-linux-user +endif + +endif + +ifeq ($(BR2_PACKAGE_QEMU_SDL),y) +QEMU_OPTS += --enable-sdl +QEMU_DEPENDENCIES += sdl +QEMU_VARS += SDL_CONFIG=$(BR2_STAGING_DIR)/usr/bin/sdl-config +else +QEMU_OPTS += --disable-sdl +endif + +QEMU_OPTS += --disable-fdt + +ifeq ($(BR2_PACKAGE_QEMU_SYSTEM_TOOLS),y) +QEMU_OPTS += --enable-tools +else +QEMU_OPTS += --disable-tools +endif + +ifeq ($(BR2_PACKAGE_QEMU_SYSTEM_VNC),y) +QEMU_OPTS += --enable-vnc +else +QEMU_OPTS += --disable-vnc +endif + +define QEMU_CONFIGURE_CMDS + ( cd $(@D); \ + LIBS='$(QEMU_LIBS)' \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + $(QEMU_VARS) \ + ./configure \ + --prefix=/usr \ + --cross-prefix=$(TARGET_CROSS) \ + --with-system-pixman \ + --audio-drv-list= \ + --enable-kvm \ + --enable-attr \ + --enable-vhost-net \ + --enable-uuid \ + --disable-bsd-user \ + --disable-xen \ + --disable-slirp \ + --disable-virtfs \ + --disable-brlapi \ + --disable-curses \ + --disable-curl \ + --disable-bluez \ + --disable-vde \ + --disable-linux-aio \ + --disable-cap-ng \ + --disable-docs \ + --disable-spice \ + --disable-rbd \ + --disable-libiscsi \ + --disable-usb-redir \ + --disable-strip \ + --disable-seccomp \ + --disable-sparse \ + $(QEMU_OPTS) \ + ) +endef + +define QEMU_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QEMU_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(QEMU_MAKE_ENV) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(call GENTARGETS,package,qemu)) Modified: branches/1.0/runnix-iso.config =================================================================== --- branches/1.0/runnix-iso.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/runnix-iso.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:27 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:06:59 2016 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -578,6 +578,7 @@ # # BR2_PACKAGE_HTPASSWD is not set # BR2_PACKAGE_MAC2VENDOR is not set +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # BR2_PACKAGE_ZONEINFO is not set Modified: branches/1.0/runnix.config =================================================================== --- branches/1.0/runnix.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/runnix.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:26 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:06:59 2016 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -579,6 +579,7 @@ # # BR2_PACKAGE_HTPASSWD is not set # BR2_PACKAGE_MAC2VENDOR is not set +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # BR2_PACKAGE_ZONEINFO is not set Modified: branches/1.0/x86_64-configs/astlinux-ast11.config =================================================================== --- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:27 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:06:59 2016 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -651,6 +651,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/x86_64-configs/astlinux-ast13.config =================================================================== --- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:27 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:07:00 2016 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -651,6 +651,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/x86_64-configs/astlinux18.config =================================================================== --- branches/1.0/x86_64-configs/astlinux18.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/x86_64-configs/astlinux18.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:27 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:06:59 2016 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -651,6 +651,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/x86_64-configs/initrd.config =================================================================== --- branches/1.0/x86_64-configs/initrd.config 2016-02-27 14:55:12 UTC (rev 7563) +++ branches/1.0/x86_64-configs/initrd.config 2016-02-27 23:30:31 UTC (rev 7564) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot 2011.08-svn7527-dirty Configuration -# Fri Feb 12 18:21:27 2016 +# Buildroot 2011.08-svn7563-dirty Configuration +# Sat Feb 27 17:07:00 2016 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -531,6 +531,7 @@ # # BR2_PACKAGE_HTPASSWD is not set # BR2_PACKAGE_MAC2VENDOR is not set +# BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # BR2_PACKAGE_ZONEINFO is not set This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |