* [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19
@ 2012-03-11 21:47 Gustavo Zacarias
2012-03-11 21:47 ` [Buildroot] [PATCH 02/20] gmp: bump to version 5.0.4 Gustavo Zacarias
` (19 more replies)
0 siblings, 20 replies; 50+ messages in thread
From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/squid/squid.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index a2160f1..9cdbeb5 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
#
#############################################################
-SQUID_VERSION = 3.1.18
+SQUID_VERSION = 3.1.19
SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
SQUID_DEPENDENCIES = libcap host-libcap
SQUID_CONF_ENV = ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [Buildroot] [PATCH 02/20] gmp: bump to version 5.0.4 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias @ 2012-03-11 21:47 ` Gustavo Zacarias 2012-03-11 22:03 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 03/20] mpd: bump to version 0.16.7 Gustavo Zacarias ` (18 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/gmp/gmp.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 2222465..7899b71 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -4,7 +4,7 @@ # ############################################################# -GMP_VERSION = 5.0.2 +GMP_VERSION = 5.0.4 GMP_SITE = $(BR2_GNU_MIRROR)/gmp GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2 GMP_INSTALL_STAGING = YES -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 02/20] gmp: bump to version 5.0.4 2012-03-11 21:47 ` [Buildroot] [PATCH 02/20] gmp: bump to version 5.0.4 Gustavo Zacarias @ 2012-03-11 22:03 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:03 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 03/20] mpd: bump to version 0.16.7 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias 2012-03-11 21:47 ` [Buildroot] [PATCH 02/20] gmp: bump to version 5.0.4 Gustavo Zacarias @ 2012-03-11 21:47 ` Gustavo Zacarias 2012-03-11 22:06 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 04/20] util-linux: bump to version 2.20.1 Gustavo Zacarias ` (17 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/multimedia/mpd/mpd.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk index 009fabb..89cf7b2 100644 --- a/package/multimedia/mpd/mpd.mk +++ b/package/multimedia/mpd/mpd.mk @@ -4,7 +4,7 @@ # ############################################################# -MPD_VERSION = 0.16.6 +MPD_VERSION = 0.16.7 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd MPD_AUTORECONF = YES MPD_DEPENDENCIES = host-pkg-config libglib2 -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 03/20] mpd: bump to version 0.16.7 2012-03-11 21:47 ` [Buildroot] [PATCH 03/20] mpd: bump to version 0.16.7 Gustavo Zacarias @ 2012-03-11 22:06 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:06 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 04/20] util-linux: bump to version 2.20.1 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias 2012-03-11 21:47 ` [Buildroot] [PATCH 02/20] gmp: bump to version 5.0.4 Gustavo Zacarias 2012-03-11 21:47 ` [Buildroot] [PATCH 03/20] mpd: bump to version 0.16.7 Gustavo Zacarias @ 2012-03-11 21:47 ` Gustavo Zacarias 2012-03-11 22:10 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 05/20] radvd: bump version to 1.8.5 Gustavo Zacarias ` (16 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/util-linux/util-linux-script-libintl.patch | 30 -------------------- package/util-linux/util-linux.mk | 3 +- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 package/util-linux/util-linux-script-libintl.patch diff --git a/package/util-linux/util-linux-script-libintl.patch b/package/util-linux/util-linux-script-libintl.patch deleted file mode 100644 index 0700aa4..0000000 --- a/package/util-linux/util-linux-script-libintl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 075f251b19509f588d828a81d91b40f47e63e3de Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <jacmet@sunsite.dk> -Date: Mon, 5 Sep 2011 21:46:25 +0200 -Subject: [PATCH] script.c: drop libintl.h include - -Commit 8fb810ff26 (script: include-what-you-use header check) added a -<libintl.h> #include, which isn't needed as nls.h includes it (if -enabled) - But worse, breaks the build for systems without libintl.h -(like some uClibc configurations). - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - term-utils/script.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/term-utils/script.c b/term-utils/script.c -index d96ca2f..f708e91 100644 ---- a/term-utils/script.c -+++ b/term-utils/script.c -@@ -55,7 +55,6 @@ - #include <getopt.h> - #include <unistd.h> - #include <fcntl.h> --#include <libintl.h> - #include <limits.h> - #include <locale.h> - #include <stddef.h> --- -1.7.5.4 - diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 55dc7bd..50de981 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -4,13 +4,14 @@ # ############################################################# -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 UTIL_LINUX_VERSION_MAJOR = 2.20 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) UTIL_LINUX_AUTORECONF = YES UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = host-pkg-config +UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 04/20] util-linux: bump to version 2.20.1 2012-03-11 21:47 ` [Buildroot] [PATCH 04/20] util-linux: bump to version 2.20.1 Gustavo Zacarias @ 2012-03-11 22:10 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:10 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. But please make your patches relative to master next time, I had to fixup the patch to get it apply (empty line before UTIL_LINUX_VERSION). -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 05/20] radvd: bump version to 1.8.5 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (2 preceding siblings ...) 2012-03-11 21:47 ` [Buildroot] [PATCH 04/20] util-linux: bump to version 2.20.1 Gustavo Zacarias @ 2012-03-11 21:47 ` Gustavo Zacarias 2012-03-11 22:11 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 06/20] usbutils: bump version to 005 Gustavo Zacarias ` (15 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/radvd/radvd.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk index d4b9a73..e63e8e0 100644 --- a/package/radvd/radvd.mk +++ b/package/radvd/radvd.mk @@ -4,8 +4,8 @@ # ############################################################# -RADVD_VERSION = 1.8.3 -RADVD_SITE = http://www.litech.org/radvd/dist/ +RADVD_VERSION = 1.8.5 +RADVD_SITE = http://www.litech.org/radvd/dist RADVD_DEPENDENCIES = flex host-flex define RADVD_INSTALL_INITSCRIPT -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 05/20] radvd: bump version to 1.8.5 2012-03-11 21:47 ` [Buildroot] [PATCH 05/20] radvd: bump version to 1.8.5 Gustavo Zacarias @ 2012-03-11 22:11 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:11 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 06/20] usbutils: bump version to 005 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (3 preceding siblings ...) 2012-03-11 21:47 ` [Buildroot] [PATCH 05/20] radvd: bump version to 1.8.5 Gustavo Zacarias @ 2012-03-11 21:47 ` Gustavo Zacarias 2012-03-11 22:12 ` Peter Korsgaard 2012-03-11 23:05 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 07/20] ntfs-3g: bump to version 2012.1.15 Gustavo Zacarias ` (14 subsequent siblings) 19 siblings, 2 replies; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw) To: buildroot Bump usbutils version to 005 and also switch to a debian mirror since it's still missing upstream. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/usbutils/usbutils.mk | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index e89f02e..cebc085 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,10 +4,12 @@ # ############################################################# -USBUTILS_VERSION = 004 -USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils +USBUTILS_VERSION = 005 +USBUTILS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbutils +USBUTILS_SOURCE = usbutils_$(USBUTILS_VERSION).orig.tar.gz USBUTILS_DEPENDENCIES = host-pkg-config libusb USBUTILS_INSTALL_STAGING = YES +USBUTILS_AUTORECONF = YES ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y) USBUTILS_DEPENDENCIES += zlib -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 06/20] usbutils: bump version to 005 2012-03-11 21:47 ` [Buildroot] [PATCH 06/20] usbutils: bump version to 005 Gustavo Zacarias @ 2012-03-11 22:12 ` Peter Korsgaard 2012-03-11 22:35 ` Gustavo Zacarias 2012-03-11 23:05 ` Peter Korsgaard 1 sibling, 1 reply; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:12 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Bump usbutils version to 005 and also switch to a debian mirror since Gustavo> it's still missing upstream. Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Gustavo> --- Gustavo> package/usbutils/usbutils.mk | 6 ++++-- Gustavo> 1 files changed, 4 insertions(+), 2 deletions(-) Gustavo> diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk Gustavo> index e89f02e..cebc085 100644 Gustavo> --- a/package/usbutils/usbutils.mk Gustavo> +++ b/package/usbutils/usbutils.mk Gustavo> @@ -4,10 +4,12 @@ Gustavo> # Gustavo> ############################################################# Gustavo> -USBUTILS_VERSION = 004 Gustavo> -USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils Gustavo> +USBUTILS_VERSION = 005 Gustavo> +USBUTILS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbutils Gustavo> +USBUTILS_SOURCE = usbutils_$(USBUTILS_VERSION).orig.tar.gz Gustavo> USBUTILS_DEPENDENCIES = host-pkg-config libusb Gustavo> USBUTILS_INSTALL_STAGING = YES Gustavo> +USBUTILS_AUTORECONF = YES Why do we need to autoreconf? We don't have any patches. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 06/20] usbutils: bump version to 005 2012-03-11 22:12 ` Peter Korsgaard @ 2012-03-11 22:35 ` Gustavo Zacarias 0 siblings, 0 replies; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 22:35 UTC (permalink / raw) To: buildroot On 2012-03-11 19:12, Peter Korsgaard wrote: > Gustavo> +USBUTILS_AUTORECONF = YES > > Why do we need to autoreconf? We don't have any patches. Tarball isn't autoconf'ed, probably since it's pulled from git rather than packaged. Regards. ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 06/20] usbutils: bump version to 005 2012-03-11 21:47 ` [Buildroot] [PATCH 06/20] usbutils: bump version to 005 Gustavo Zacarias 2012-03-11 22:12 ` Peter Korsgaard @ 2012-03-11 23:05 ` Peter Korsgaard 1 sibling, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 23:05 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Bump usbutils version to 005 and also switch to a debian mirror since Gustavo> it's still missing upstream. Committed, thanks. I added a comment about why we autoreconf and changed it to use a stable snapshot.debian.org URL instead. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 07/20] ntfs-3g: bump to version 2012.1.15 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (4 preceding siblings ...) 2012-03-11 21:47 ` [Buildroot] [PATCH 06/20] usbutils: bump version to 005 Gustavo Zacarias @ 2012-03-11 21:47 ` Gustavo Zacarias 2012-03-11 22:12 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 08/20] ntfsprogs: remove deprecated Gustavo Zacarias ` (13 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/ntfs-3g/ntfs-3g.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk index f6462bb..8e616cb 100644 --- a/package/ntfs-3g/ntfs-3g.mk +++ b/package/ntfs-3g/ntfs-3g.mk @@ -4,7 +4,7 @@ # ############################################################# -NTFS_3G_VERSION = 2011.4.12 +NTFS_3G_VERSION = 2012.1.15 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz NTFS_3G_SITE = http://tuxera.com/opensource NTFS_3G_CONF_OPT = --disable-ldconfig -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 07/20] ntfs-3g: bump to version 2012.1.15 2012-03-11 21:47 ` [Buildroot] [PATCH 07/20] ntfs-3g: bump to version 2012.1.15 Gustavo Zacarias @ 2012-03-11 22:12 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:12 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 08/20] ntfsprogs: remove deprecated 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (5 preceding siblings ...) 2012-03-11 21:47 ` [Buildroot] [PATCH 07/20] ntfs-3g: bump to version 2012.1.15 Gustavo Zacarias @ 2012-03-11 21:47 ` Gustavo Zacarias 2012-03-11 22:13 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 09/20] libnl: bump to version 3.2.7 Gustavo Zacarias ` (12 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/Config.in | 1 - package/ntfsprogs/Config.in | 12 ------ ...tfsprogs-2.0.0-no-pkgconfig-path-override.patch | 42 -------------------- package/ntfsprogs/ntfsprogs.mk | 26 ------------ 4 files changed, 0 insertions(+), 81 deletions(-) delete mode 100644 package/ntfsprogs/Config.in delete mode 100644 package/ntfsprogs/ntfsprogs-2.0.0-no-pkgconfig-path-override.patch delete mode 100644 package/ntfsprogs/ntfsprogs.mk diff --git a/package/Config.in b/package/Config.in index 3945c98..33fe6ac 100644 --- a/package/Config.in +++ b/package/Config.in @@ -200,7 +200,6 @@ source "package/memtester/Config.in" source "package/minicom/Config.in" source "package/mtd/Config.in" source "package/ntfs-3g/Config.in" -source "package/ntfsprogs/Config.in" source "package/open2300/Config.in" source "package/openocd/Config.in" source "package/pciutils/Config.in" diff --git a/package/ntfsprogs/Config.in b/package/ntfsprogs/Config.in deleted file mode 100644 index 561c1d4..0000000 --- a/package/ntfsprogs/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_NTFSPROGS - bool "ntfsprogs" - depends on BR2_USE_WCHAR - depends on BR2_LARGEFILE - depends on BR2_DEPRECATED - help - wide collection of NTFS utilities - - http://www.linux-ntfs.org/ - -comment "ntfsprogs requires a toolchain with WCHAR and LARGEFILE support" - depends on !BR2_USE_WCHAR || !BR2_LARGEFILE diff --git a/package/ntfsprogs/ntfsprogs-2.0.0-no-pkgconfig-path-override.patch b/package/ntfsprogs/ntfsprogs-2.0.0-no-pkgconfig-path-override.patch deleted file mode 100644 index bf7824d..0000000 --- a/package/ntfsprogs/ntfsprogs-2.0.0-no-pkgconfig-path-override.patch +++ /dev/null @@ -1,42 +0,0 @@ -[PATCH] ntfsprogs: don't override PKG_CONFIG_PATH - -Adding hardcoded directories to the pkg-config search path breaks -cross compilation (E.G. if the host has a .pc for a package the -target doesn't have). - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - configure | 4 ---- - configure.ac | 4 ---- - 2 files changed, 8 deletions(-) - -Index: ntfsprogs-2.0.0/configure.ac -=================================================================== ---- ntfsprogs-2.0.0.orig/configure.ac -+++ ntfsprogs-2.0.0/configure.ac -@@ -168,10 +168,6 @@ AC_PROG_MAKE_SET - AC_PROG_LIBTOOL - PKG_PROG_PKG_CONFIG - --# Libraries often install their metadata .pc files in directories not searched --# by pkg-config. Let's workaround this. --export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:$prefix/lib/pkgconfig:/opt/gnome/share/pkgconfig:/usr/local/share/pkgconfig -- - # Enable large file support. - AC_SYS_LARGEFILE - -Index: ntfsprogs-2.0.0/configure -=================================================================== ---- ntfsprogs-2.0.0.orig/configure -+++ ntfsprogs-2.0.0/configure -@@ -20210,10 +20210,6 @@ echo "${ECHO_T}no" >&6; } - - fi - --# Libraries often install their metadata .pc files in directories not searched --# by pkg-config. Let's workaround this. --export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:$prefix/lib/pkgconfig:/opt/gnome/share/pkgconfig:/usr/local/share/pkgconfig -- - # Enable large file support. - # Check whether --enable-largefile was given. - if test "${enable_largefile+set}" = set; then diff --git a/package/ntfsprogs/ntfsprogs.mk b/package/ntfsprogs/ntfsprogs.mk deleted file mode 100644 index 32b9cb2..0000000 --- a/package/ntfsprogs/ntfsprogs.mk +++ /dev/null @@ -1,26 +0,0 @@ -############################################################# -# -# ntfsprogs -# -############################################################# -NTFSPROGS_VERSION:=2.0.0 -NTFSPROGS_SOURCE:=ntfsprogs-$(NTFSPROGS_VERSION).tar.gz -NTFSPROGS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-ntfs/ -NTFSPROGS_CONF_OPT:=--disable-gnome-vfs --disable-crypto -NTFSPROGS_INSTALL_STAGING:=yes - -NTFSPROGS_BIN:=ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls -NTFSPROGS_SBIN:=ntfsclone ntfscp ntfslabel ntfsresize ntfsundelete mkntfs - -ifeq ($(BR2_PACKAGE_LIBFUSE),y) -NTFSPROGS_DEPENDENCIES += libfuse -endif - -define NTFSPROGS_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/usr/lib/libntfs.so* - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(NTFSPROGS_BIN)) - rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(NTFSPROGS_SBIN)) - -unlink $(TARGET_DIR)/sbin/mkfs.ntfs -endef - -$(eval $(call AUTOTARGETS)) -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 08/20] ntfsprogs: remove deprecated 2012-03-11 21:47 ` [Buildroot] [PATCH 08/20] ntfsprogs: remove deprecated Gustavo Zacarias @ 2012-03-11 22:13 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:13 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 09/20] libnl: bump to version 3.2.7 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (6 preceding siblings ...) 2012-03-11 21:47 ` [Buildroot] [PATCH 08/20] ntfsprogs: remove deprecated Gustavo Zacarias @ 2012-03-11 21:47 ` Gustavo Zacarias 2012-03-11 22:14 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 10/20] nbd: bump to version 3.0 Gustavo Zacarias ` (11 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/libnl/libnl.mk | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index fc37c7d..661d7f2 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -4,9 +4,8 @@ # ############################################################# -LIBNL_VERSION = 3.2.4 -LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz -LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/ +LIBNL_VERSION = 3.2.7 +LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison LIBNL_MAKE = $(MAKE1) -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 09/20] libnl: bump to version 3.2.7 2012-03-11 21:47 ` [Buildroot] [PATCH 09/20] libnl: bump to version 3.2.7 Gustavo Zacarias @ 2012-03-11 22:14 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:14 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 10/20] nbd: bump to version 3.0 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (7 preceding siblings ...) 2012-03-11 21:47 ` [Buildroot] [PATCH 09/20] libnl: bump to version 3.2.7 Gustavo Zacarias @ 2012-03-11 21:47 ` Gustavo Zacarias 2012-03-11 22:19 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 11/20] smartmontools: bump to version 5.42 Gustavo Zacarias ` (10 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:47 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/nbd/nbd-fix-non-lfs.patch | 37 ----------------------------- package/nbd/nbd-server-susv3-legacy.patch | 11 -------- package/nbd/nbd.mk | 5 +++- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 package/nbd/nbd-fix-non-lfs.patch delete mode 100644 package/nbd/nbd-server-susv3-legacy.patch diff --git a/package/nbd/nbd-fix-non-lfs.patch b/package/nbd/nbd-fix-non-lfs.patch deleted file mode 100644 index 41a80cd..0000000 --- a/package/nbd/nbd-fix-non-lfs.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8dd182693e9995bc1aeb907f9fd4ec06c18fc56f Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <jacmet@sunsite.dk> -Date: Mon, 5 Dec 2011 23:27:30 +0100 -Subject: [PATCH] lfs.h: fix !LFS builds - -Commit 448637fba4 (Fix 32/64 bit confusion) broke !LFS builds as it -added the PARAM_OFFT defines inside the wrong conditional. - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - lfs.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lfs.h b/lfs.h -index 64a03de..68d3b81 100644 ---- a/lfs.h -+++ b/lfs.h -@@ -6,14 +6,14 @@ - #define _FILE_OFFSET_BITS 64 - #ifndef _LARGEFILE_SOURCE - #define _LARGEFILE_SOURCE -+#endif - #define PARAM_OFFT PARAM_INT64 - #else - #define PARAM_OFFT PARAM_INT --#endif -+#endif /* NBD_LFS */ - #ifdef HAVE_SYNC_FILE_RANGE - #define USE_SYNC_FILE_RANGE - #define _GNU_SOURCE - #endif /* HAVE_SYNC_FILE_RANGE */ --#endif /* NBD_LFS */ - - #endif /* LFS_H */ --- -1.7.7.1 - diff --git a/package/nbd/nbd-server-susv3-legacy.patch b/package/nbd/nbd-server-susv3-legacy.patch deleted file mode 100644 index 58d38e1..0000000 --- a/package/nbd/nbd-server-susv3-legacy.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nbd-2.9.11/nbd-server.c 2009-10-01 16:10:15.000000000 +0200 -+++ nbd-2.9.11/nbd-server.c 2009-10-01 16:10:32.000000000 +0200 -@@ -264,7 +264,7 @@ - - inet_aton(opts->clientname, &client); - while (fgets(line,LINELEN,f)!=NULL) { -- if((tmp=index(line, '/'))) { -+ if((tmp=strchr(line, '/'))) { - if(strlen(line)<=tmp-line) { - msg4(LOG_CRIT, ERRMSG, line, opts->server->authname); - return 0; diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index d9d0a85..21071fa 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,11 +4,14 @@ # ############################################################# -NBD_VERSION = 2.9.24 +NBD_VERSION = 3.0 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2 NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/ NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs) NBD_DEPENDENCIES = libglib2 +# We have linux/falloc.h +# but uClibc lacks fallocate(2) which is a glibc-ism +NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no ifneq ($(BR2_NBD_CLIENT),y) NBD_TOREMOVE += nbd-client -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 10/20] nbd: bump to version 3.0 2012-03-11 21:47 ` [Buildroot] [PATCH 10/20] nbd: bump to version 3.0 Gustavo Zacarias @ 2012-03-11 22:19 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:19 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Gustavo> --- Gustavo> package/nbd/nbd-fix-non-lfs.patch | 37 ----------------------------- Gustavo> package/nbd/nbd-server-susv3-legacy.patch | 11 -------- Gustavo> package/nbd/nbd.mk | 5 +++- Gustavo> 3 files changed, 4 insertions(+), 49 deletions(-) Gustavo> delete mode 100644 package/nbd/nbd-fix-non-lfs.patch Gustavo> delete mode 100644 package/nbd/nbd-server-susv3-legacy.patch Gustavo> diff --git a/package/nbd/nbd-fix-non-lfs.patch b/package/nbd/nbd-fix-non-lfs.patch Gustavo> deleted file mode 100644 Gustavo> index 41a80cd..0000000 Gustavo> --- a/package/nbd/nbd-fix-non-lfs.patch Gustavo> +++ /dev/null Gustavo> @@ -1,37 +0,0 @@ Gustavo> -From 8dd182693e9995bc1aeb907f9fd4ec06c18fc56f Mon Sep 17 00:00:00 2001 Gustavo> -From: Peter Korsgaard <jacmet@sunsite.dk> Gustavo> -Date: Mon, 5 Dec 2011 23:27:30 +0100 Gustavo> -Subject: [PATCH] lfs.h: fix !LFS builds Gustavo> - Gustavo> -Commit 448637fba4 (Fix 32/64 bit confusion) broke !LFS builds as it Gustavo> -added the PARAM_OFFT defines inside the wrong conditional. Gustavo> - Gustavo> -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Gustavo> ---- Gustavo> - lfs.h | 4 ++-- Gustavo> - 1 files changed, 2 insertions(+), 2 deletions(-) Gustavo> - Gustavo> -diff --git a/lfs.h b/lfs.h Gustavo> -index 64a03de..68d3b81 100644 Gustavo> ---- a/lfs.h Gustavo> -+++ b/lfs.h Gustavo> -@@ -6,14 +6,14 @@ Gustavo> - #define _FILE_OFFSET_BITS 64 Gustavo> - #ifndef _LARGEFILE_SOURCE Gustavo> - #define _LARGEFILE_SOURCE Gustavo> -+#endif Gustavo> - #define PARAM_OFFT PARAM_INT64 Gustavo> - #else Gustavo> - #define PARAM_OFFT PARAM_INT Gustavo> --#endif Gustavo> -+#endif /* NBD_LFS */ Gustavo> - #ifdef HAVE_SYNC_FILE_RANGE Gustavo> - #define USE_SYNC_FILE_RANGE Gustavo> - #define _GNU_SOURCE Gustavo> - #endif /* HAVE_SYNC_FILE_RANGE */ Gustavo> --#endif /* NBD_LFS */ Gustavo> - Gustavo> - #endif /* LFS_H */ Gustavo> --- Gustavo> -1.7.7.1 Gustavo> - Gustavo> diff --git a/package/nbd/nbd-server-susv3-legacy.patch b/package/nbd/nbd-server-susv3-legacy.patch Gustavo> deleted file mode 100644 Gustavo> index 58d38e1..0000000 Gustavo> --- a/package/nbd/nbd-server-susv3-legacy.patch Gustavo> +++ /dev/null Gustavo> @@ -1,11 +0,0 @@ Gustavo> ---- nbd-2.9.11/nbd-server.c 2009-10-01 16:10:15.000000000 +0200 Gustavo> -+++ nbd-2.9.11/nbd-server.c 2009-10-01 16:10:32.000000000 +0200 Gustavo> -@@ -264,7 +264,7 @@ Gustavo> - Gustavo> - inet_aton(opts->clientname, &client); Gustavo> - while (fgets(line,LINELEN,f)!=NULL) { Gustavo> -- if((tmp=index(line, '/'))) { Gustavo> -+ if((tmp=strchr(line, '/'))) { Gustavo> - if(strlen(line)<=tmp-line) { Gustavo> - msg4(LOG_CRIT, ERRMSG, line, opts->server->authname); Gustavo> - return 0; Gustavo> diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk Gustavo> index d9d0a85..21071fa 100644 Gustavo> --- a/package/nbd/nbd.mk Gustavo> +++ b/package/nbd/nbd.mk Gustavo> @@ -4,11 +4,14 @@ Gustavo> # Gustavo> ############################################################# Gustavo> -NBD_VERSION = 2.9.24 Gustavo> +NBD_VERSION = 3.0 Gustavo> NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2 Gustavo> NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/ Gustavo> NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs) Gustavo> NBD_DEPENDENCIES = libglib2 Gustavo> +# We have linux/falloc.h Gustavo> +# but uClibc lacks fallocate(2) which is a glibc-ism Gustavo> +NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no I but this in a: ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) conditional. Other that that it looks fine, committed - Thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 11/20] smartmontools: bump to version 5.42 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (8 preceding siblings ...) 2012-03-11 21:47 ` [Buildroot] [PATCH 10/20] nbd: bump to version 3.0 Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:14 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 12/20] libfuse: bump to version 2.8.7 Gustavo Zacarias ` (9 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/smartmontools/smartmontools.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index d14e740..3a6fce7 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -4,7 +4,7 @@ # ############################################################# -SMARTMONTOOLS_VERSION = 5.41 +SMARTMONTOOLS_VERSION = 5.42 SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools $(eval $(call AUTOTARGETS)) -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 11/20] smartmontools: bump to version 5.42 2012-03-11 21:48 ` [Buildroot] [PATCH 11/20] smartmontools: bump to version 5.42 Gustavo Zacarias @ 2012-03-11 22:14 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:14 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 12/20] libfuse: bump to version 2.8.7 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (9 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 11/20] smartmontools: bump to version 5.42 Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:14 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 13/20] hdparm: bump to version 9.39 Gustavo Zacarias ` (8 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/libfuse/libfuse.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index 25cc45f..3616c65 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBFUSE_VERSION = 2.8.6 +LIBFUSE_VERSION = 2.8.7 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/ -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 12/20] libfuse: bump to version 2.8.7 2012-03-11 21:48 ` [Buildroot] [PATCH 12/20] libfuse: bump to version 2.8.7 Gustavo Zacarias @ 2012-03-11 22:14 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:14 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 13/20] hdparm: bump to version 9.39 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (10 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 12/20] libfuse: bump to version 2.8.7 Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:19 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 14/20] sysstat: bump to version 10.0.3 Gustavo Zacarias ` (7 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/hdparm/hdparm.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index abbb0c3..fb90ce2 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ############################################################# -HDPARM_VERSION = 9.38 +HDPARM_VERSION = 9.39 HDPARM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm define HDPARM_BUILD_CMDS -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 13/20] hdparm: bump to version 9.39 2012-03-11 21:48 ` [Buildroot] [PATCH 13/20] hdparm: bump to version 9.39 Gustavo Zacarias @ 2012-03-11 22:19 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:19 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 14/20] sysstat: bump to version 10.0.3 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (11 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 13/20] hdparm: bump to version 9.39 Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:20 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 15/20] mpfr: bump to version 3.1.0-p6 Gustavo Zacarias ` (6 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/sysstat/sysstat.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 0a17b4d..55991c4 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ############################################################# -SYSSTAT_VERSION = 10.0.2 +SYSSTAT_VERSION = 10.0.3 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPT = --disable-man-group --disable-sensors -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 14/20] sysstat: bump to version 10.0.3 2012-03-11 21:48 ` [Buildroot] [PATCH 14/20] sysstat: bump to version 10.0.3 Gustavo Zacarias @ 2012-03-11 22:20 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:20 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 15/20] mpfr: bump to version 3.1.0-p6 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (12 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 14/20] sysstat: bump to version 10.0.3 Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:58 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 16/20] grep: bump to version 2.11 Gustavo Zacarias ` (5 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/mpfr/mpfr-3.0.1_p4.patch | 367 --------------------- package/mpfr/mpfr-3.1.0-p6.patch | 673 ++++++++++++++++++++++++++++++++++++++ package/mpfr/mpfr.mk | 2 +- 3 files changed, 674 insertions(+), 368 deletions(-) delete mode 100644 package/mpfr/mpfr-3.0.1_p4.patch create mode 100644 package/mpfr/mpfr-3.1.0-p6.patch diff --git a/package/mpfr/mpfr-3.0.1_p4.patch b/package/mpfr/mpfr-3.0.1_p4.patch deleted file mode 100644 index 9604635..0000000 --- a/package/mpfr/mpfr-3.0.1_p4.patch +++ /dev/null @@ -1,367 +0,0 @@ -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-04-12 10:50:02.000000000 +0000 -@@ -0,0 +1 @@ -+asin_exprange -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-04-12 10:50:02.000000000 +0000 -@@ -1 +1 @@ --3.0.1 -+3.0.1-p1 -diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c ---- mpfr-3.0.1-a/asin.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/asin.c 2011-04-12 10:50:02.000000000 +0000 -@@ -63,11 +63,14 @@ - - compared = mpfr_cmp_ui (xp, 1); - -+ MPFR_SAVE_EXPO_MARK (expo); -+ - if (MPFR_UNLIKELY (compared >= 0)) - { - mpfr_clear (xp); - if (compared > 0) /* asin(x) = NaN for |x| > 1 */ - { -+ MPFR_SAVE_EXPO_FREE (expo); - MPFR_SET_NAN (asin); - MPFR_RET_NAN; - } -@@ -80,13 +83,11 @@ - inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode)); - MPFR_CHANGE_SIGN (asin); - } -- mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */ -- return inexact; -+ mpfr_div_2ui (asin, asin, 1, rnd_mode); - } - } -- -- MPFR_SAVE_EXPO_MARK (expo); -- -+ else -+ { - /* Compute exponent of 1 - ABS(x) */ - mpfr_ui_sub (xp, 1, xp, MPFR_RNDD); - MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0); -@@ -115,6 +116,7 @@ - inexact = mpfr_set (asin, xp, rnd_mode); - - mpfr_clear (xp); -+ } - - MPFR_SAVE_EXPO_FREE (expo); - return mpfr_check_range (asin, inexact, rnd_mode); -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-04-12 10:50:02.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1" -+#define MPFR_VERSION_STRING "3.0.1-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c ---- mpfr-3.0.1-a/tests/tasin.c 2011-04-04 10:19:17.000000000 +0000 -+++ mpfr-3.0.1-b/tests/tasin.c 2011-04-12 10:50:02.000000000 +0000 -@@ -219,6 +219,49 @@ - mpfr_clear (y); - } - -+static void -+reduced_expo_range (void) -+{ -+ mpfr_exp_t emin, emax; -+ mpfr_t x, y, ex_y; -+ int inex, ex_inex; -+ unsigned int flags, ex_flags; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ -+ mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0); -+ mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN); -+ -+ mpfr_set_emin (1); -+ mpfr_set_emax (1); -+ mpfr_clear_flags (); -+ inex = mpfr_asin (y, x, MPFR_RNDA); -+ flags = __gmpfr_flags; -+ mpfr_set_emin (emin); -+ mpfr_set_emax (emax); -+ -+ mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN); -+ ex_inex = -1; -+ ex_flags = MPFR_FLAGS_INEXACT; -+ -+ if (SIGN (inex) != ex_inex || flags != ex_flags || -+ ! mpfr_equal_p (y, ex_y)) -+ { -+ printf ("Error in reduced_expo_range\non x = "); -+ mpfr_dump (x); -+ printf ("Expected y = "); -+ mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", ex_inex, ex_flags); -+ printf ("Got y = "); -+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", SIGN (inex), flags); -+ exit (1); -+ } -+ -+ mpfr_clears (x, y, ex_y, (mpfr_ptr) 0); -+} -+ - int - main (void) - { -@@ -226,6 +269,7 @@ - - special (); - special_overflow (); -+ reduced_expo_range (); - - test_generic (2, 100, 15); - -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-04-12 10:50:02.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1"; -+ return "3.0.1-p1"; - } -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-05-04 11:18:33.000000000 +0000 -@@ -0,0 +1 @@ -+rec_sqrt-carry -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-05-04 11:18:33.000000000 +0000 -@@ -1 +1 @@ --3.0.1-p1 -+3.0.1-p2 -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-05-04 11:18:33.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1-p1" -+#define MPFR_VERSION_STRING "3.0.1-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c ---- mpfr-3.0.1-a/rec_sqrt.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/rec_sqrt.c 2011-05-04 11:18:33.000000000 +0000 -@@ -375,20 +375,37 @@ - MPFR_ASSERTD(un == ln + 1 || un == ln + 2); - /* the high un-ln limbs of u will overlap the low part of {x+ln,xn}, - we need to add or subtract the overlapping part {u + ln, un - ln} */ -+ /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1 -+ below (with size = th) mustn't be used. In such a case, the limb -+ (carry) will be 0, so that this is semantically a no-op, but if -+ mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a -+ non-atomic read/write in a place that is not always allocated, -+ with the possible consequences: a crash if the corresponding -+ address is not mapped, or (rather unlikely) memory corruption -+ if another process/thread writes@the same place; things may -+ be worse with future GMP versions. Hence the tests carry != 0. */ - if (neg == 0) - { - if (ln > 0) - MPN_COPY (x, u, ln); - cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln); - /* add cu at x+un */ -- cy += mpn_add_1 (x + un, x + un, th, cu); -+ if (cu != 0) -+ { -+ MPFR_ASSERTD (th != 0); -+ cy += mpn_add_1 (x + un, x + un, th, cu); -+ } - } - else /* negative case */ - { - /* subtract {u+ln, un-ln} from {x+ln,un} */ - cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln); - /* carry cy is at x+un, like cu */ -- cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */ -+ if (cy + cu != 0) -+ { -+ MPFR_ASSERTD (th != 0); -+ cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */ -+ } - /* cy cannot be zero, since the most significant bit of Xh is 1, - and the correction is bounded by 2^{-h+3} */ - MPFR_ASSERTD(cy == 0); -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-05-04 11:18:33.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1-p1"; -+ return "3.0.1-p2"; - } -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-05-05 00:00:35.000000000 +0000 -@@ -0,0 +1 @@ -+atan-expo-range -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-05-05 00:00:35.000000000 +0000 -@@ -1 +1 @@ --3.0.1-p2 -+3.0.1-p3 -diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c ---- mpfr-3.0.1-a/atan.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/atan.c 2011-05-05 00:00:35.000000000 +0000 -@@ -431,5 +431,5 @@ - MPFR_GROUP_CLEAR (group); - - MPFR_SAVE_EXPO_FREE (expo); -- return mpfr_check_range (arctgt, inexact, rnd_mode); -+ return mpfr_check_range (atan, inexact, rnd_mode); - } -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-05-05 00:00:35.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1-p2" -+#define MPFR_VERSION_STRING "3.0.1-p3" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c ---- mpfr-3.0.1-a/tests/tatan.c 2011-04-04 10:19:17.000000000 +0000 -+++ mpfr-3.0.1-b/tests/tatan.c 2011-05-05 00:00:35.000000000 +0000 -@@ -535,6 +535,52 @@ - mpfr_clears (a, x, y, (mpfr_ptr) 0); - } - -+/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html -+ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure). -+ */ -+static void -+reduced_expo_range (void) -+{ -+ mpfr_exp_t emin, emax; -+ mpfr_t x, y, ex_y; -+ int inex, ex_inex; -+ unsigned int flags, ex_flags; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ -+ mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0); -+ mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN); -+ -+ mpfr_set_emin (-5); -+ mpfr_set_emax (-5); -+ mpfr_clear_flags (); -+ inex = mpfr_atan (y, x, MPFR_RNDN); -+ flags = __gmpfr_flags; -+ mpfr_set_emin (emin); -+ mpfr_set_emax (emax); -+ -+ mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN); -+ ex_inex = 1; -+ ex_flags = MPFR_FLAGS_INEXACT; -+ -+ if (SIGN (inex) != ex_inex || flags != ex_flags || -+ ! mpfr_equal_p (y, ex_y)) -+ { -+ printf ("Error in reduced_expo_range\non x = "); -+ mpfr_dump (x); -+ printf ("Expected y = "); -+ mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", ex_inex, ex_flags); -+ printf ("Got y = "); -+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", SIGN (inex), flags); -+ exit (1); -+ } -+ -+ mpfr_clears (x, y, ex_y, (mpfr_ptr) 0); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -546,6 +592,7 @@ - smallvals_atan2 (); - atan2_bug_20071003 (); - atan2_different_prec (); -+ reduced_expo_range (); - - test_generic_atan (2, 200, 17); - test_generic_atan2 (2, 200, 17); -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-05-05 00:00:35.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1-p2"; -+ return "3.0.1-p3"; - } -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-05-09 14:48:24.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-05-09 14:48:24.000000000 +0000 -@@ -0,0 +1 @@ -+texp-zero -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-05-09 14:48:24.000000000 +0000 -@@ -1 +1 @@ --3.0.1-p3 -+3.0.1-p4 -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-05-09 14:48:24.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1-p3" -+#define MPFR_VERSION_STRING "3.0.1-p4" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c ---- mpfr-3.0.1-a/tests/texp.c 2011-04-04 10:19:17.000000000 +0000 -+++ mpfr-3.0.1-b/tests/texp.c 2011-05-09 14:48:24.000000000 +0000 -@@ -170,7 +170,9 @@ - mpfr_set_prec (x, prec); - mpfr_set_prec (y, prec); - mpfr_set_prec (z, prec); -- mpfr_urandomb (x, RANDS); -+ do -+ mpfr_urandomb (x, RANDS); -+ while (MPFR_IS_ZERO (x)); /* 0 is handled by mpfr_exp only */ - rnd = RND_RAND (); - mpfr_exp_2 (y, x, rnd); - mpfr_exp_3 (z, x, rnd); -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-05-09 14:48:24.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1-p3"; -+ return "3.0.1-p4"; - } diff --git a/package/mpfr/mpfr-3.1.0-p6.patch b/package/mpfr/mpfr-3.1.0-p6.patch new file mode 100644 index 0000000..edb852f --- /dev/null +++ b/package/mpfr/mpfr-3.1.0-p6.patch @@ -0,0 +1,673 @@ +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 +@@ -0,0 +1 @@ ++mpfr_unlikely +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 +@@ -1 +1 @@ +-3.1.0 ++3.1.0-p1 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 +@@ -988,10 +988,11 @@ + ******************************************************/ + + /* Theses macros help the compiler to determine if a test is +- * likely or unlikely. */ ++ likely or unlikely. The !! is necessary in case x is larger ++ than a long. */ + #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) + # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) +-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) ++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) + #else + # define MPFR_LIKELY(x) (x) + # define MPFR_UNLIKELY(x) (x) +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0" ++#define MPFR_VERSION_STRING "3.1.0-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0"; ++ return "3.1.0-p1"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-14 10:43:32.000000000 +0000 +@@ -0,0 +1 @@ ++lib-search-path +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-14 10:43:32.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p1 ++3.1.0-p2 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p1" ++#define MPFR_VERSION_STRING "3.1.0-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-14 10:43:32.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p1"; ++ return "3.1.0-p2"; + } +diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am +--- mpfr-3.1.0-a/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 +@@ -65,8 +65,24 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs +diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in +--- mpfr-3.1.0-a/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 +@@ -1124,11 +1124,27 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs + all: all-am + + .SUFFIXES: +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-11-03 15:15:11.000000000 +0000 +@@ -0,0 +1 @@ ++vasprintf +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-11-03 15:15:11.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p2 ++3.1.0-p3 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p2" ++#define MPFR_VERSION_STRING "3.1.0-p3" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c +--- mpfr-3.1.0-a/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -1178,7 +1178,7 @@ + mpfr_exp_t exp; + char * str; + const int spec_g = (spec.spec == 'g' || spec.spec == 'G'); +- const int keep_trailing_zeros = spec_g && spec.alt; ++ const int keep_trailing_zeros = !spec_g || spec.alt; + + /* WARNING: an empty precision field is forbidden (it means precision = 6 + and it should have been changed to 6 before the function call) */ +@@ -1356,7 +1356,7 @@ + else + /* 1 <= |p| */ + { +- size_t nsd; /* Number of significant digits */ ++ size_t str_len; + + /* Determine the position of the most significant decimal digit. */ + exp = floor_log10 (p); +@@ -1365,12 +1365,10 @@ + /* P is too large to print all its integral part digits */ + return -1; + +- np->ip_size = exp + 1; +- +- nsd = spec.prec + np->ip_size; + if (dec_info == NULL) +- { +- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode); ++ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */ ++ str = ++ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode); + register_string (np->sl, str); + } + else +@@ -1379,81 +1377,60 @@ + str = dec_info->str; + } + np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */ ++ str_len = strlen (str); ++ ++ /* integral part */ ++ if (exp > str_len) ++ /* mpfr_get_str gives no trailing zero when p is rounded up to the next ++ power of 10 (p integer, so no fractional part) */ ++ { ++ np->ip_trailing_zeros = exp - str_len; ++ np->ip_size = str_len; ++ } ++ else ++ np->ip_size = exp; + + if (spec.group) + /* thousands separator in integral part */ + np->thousands_sep = MPFR_THOUSANDS_SEPARATOR; + +- if (nsd == 0 || (spec_g && !spec.alt)) +- /* compute how much non-zero digits in integral and fractional +- parts */ ++ /* fractional part */ ++ str += np->ip_size; ++ str_len -= np->ip_size; ++ if (!keep_trailing_zeros) ++ /* remove trailing zeros, if any */ + { +- size_t str_len; +- str_len = strlen (str); /* note: the sign has been skipped */ +- +- if (exp > str_len) +- /* mpfr_get_str doesn't give the trailing zeros when p is a +- multiple of 10 (p integer, so no fractional part) */ +- { +- np->ip_trailing_zeros = exp - str_len; +- np->ip_size = str_len; +- if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; +- } +- else +- /* str may contain some digits which are in fractional part */ ++ char *ptr = str + str_len - 1; /* pointer to the last digit of ++ str */ ++ while ((*ptr == '0') && (str_len != 0)) + { +- char *ptr; +- +- ptr = str + str_len - 1; /* points to the end of str */ +- str_len -= np->ip_size; /* number of digits in fractional +- part */ +- +- if (!keep_trailing_zeros) +- /* remove trailing zeros, if any */ +- { +- while ((*ptr == '0') && (str_len != 0)) +- { +- --ptr; +- --str_len; +- } +- } +- +- if (str_len > INT_MAX) +- /* too many digits in fractional part */ +- return -1; +- +- if (str_len != 0) +- /* some digits in fractional part */ +- { +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = str_len; +- } ++ --ptr; ++ --str_len; + } + } +- else +- /* spec.prec digits in fractional part */ ++ ++ if (str_len > 0) ++ /* some nonzero digits in fractional part */ + { +- if (np->ip_size == exp - 1) +- /* the absolute value of the number has been rounded up to a power +- of ten. +- Insert an additional zero in integral part and put the rest of +- them in fractional part. */ +- np->ip_trailing_zeros = 1; ++ if (str_len > INT_MAX) ++ /* too many digits in fractional part */ ++ return -1; + +- if (spec.prec != 0) +- { +- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp); +- MPFR_ASSERTD (np->ip_size + spec.prec == nsd); ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_ptr = str; ++ np->fp_size = str_len; ++ } + +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = spec.prec; +- } +- else if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; ++ if (keep_trailing_zeros && str_len < spec.prec) ++ /* add missing trailing zeros */ ++ { ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_trailing_zeros = spec.prec - np->fp_size; + } ++ ++ if (spec.alt) ++ /* add decimal point even if no digits follow it */ ++ np->point = MPFR_DECIMAL_POINT; + } + + return 0; +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-11-03 15:15:11.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p2"; ++ return "3.1.0-p3"; + } +diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c +--- mpfr-3.1.0-a/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -475,6 +475,18 @@ + check_sprintf ("-1.", "%- #0.1RG", x); + + /* precision zero */ ++ mpfr_set_d (x, 9.5, MPFR_RNDN); ++ check_sprintf ("9", "%.0RDf", x); ++ check_sprintf ("10", "%.0RUf", x); ++ ++ mpfr_set_d (x, 19.5, MPFR_RNDN); ++ check_sprintf ("19", "%.0RDf", x); ++ check_sprintf ("20", "%.0RUf", x); ++ ++ mpfr_set_d (x, 99.5, MPFR_RNDN); ++ check_sprintf ("99", "%.0RDf", x); ++ check_sprintf ("100", "%.0RUf", x); ++ + mpfr_set_d (x, -9.5, MPFR_RNDN); + check_sprintf ("-10", "%.0RDf", x); + check_sprintf ("-10", "%.0RYf", x); +@@ -1078,6 +1090,23 @@ + mpfr_clear (x); + } + ++static void ++bug20111102 (void) ++{ ++ mpfr_t t; ++ char s[100]; ++ ++ mpfr_init2 (t, 84); ++ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN); ++ mpfr_sprintf (s, "%.20RNg", t); ++ if (strcmp (s, "1000") != 0) ++ { ++ printf ("Error in bug20111102, expected 1000, got %s\n", s); ++ exit (1); ++ } ++ mpfr_clear (t); ++} ++ + /* In particular, the following test makes sure that the rounding + * for %Ra and %Rb is not done on the MPFR number itself (as it + * would overflow). Note: it has been reported on comp.std.c that +@@ -1161,6 +1190,7 @@ + locale = setlocale (LC_ALL, "C"); + #endif + ++ bug20111102 (); + native_types (); + hexadecimal (); + binary (); +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-11-28 12:22:52.000000000 +0000 +@@ -0,0 +1 @@ ++gmp41compat +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-11-28 12:22:52.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p3 ++3.1.0-p4 +diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info +--- mpfr-3.1.0-a/doc/mpfr.info 2011-10-03 09:43:04.000000000 +0000 ++++ mpfr-3.1.0-b/doc/mpfr.info 2011-11-28 12:22:52.000000000 +0000 +@@ -2994,11 +2994,12 @@ + + * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1. Their + behavior no longer depends on the platform (assuming this is also +- true for GMP's random generator). As a consequence, the returned +- values can be different between MPFR 3.1 and previous MPFR +- versions. Note: as the reproducibility of these functions was not +- specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded +- as backward incompatible with previous versions. ++ true for GMP's random generator, which is not the case between GMP ++ 4.1 and 4.2 if `gmp_randinit_default' is used). As a consequence, ++ the returned values can be different between MPFR 3.1 and previous ++ MPFR versions. Note: as the reproducibility of these functions ++ was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ ++ regarded as backward incompatible with previous versions. + + + \x1f +@@ -4239,13 +4240,13 @@ + Node: Type and Macro Changes\x7f129308 + Node: Added Functions\x7f132029 + Node: Changed Functions\x7f134972 +-Node: Removed Functions\x7f139167 +-Node: Other Changes\x7f139579 +-Node: Contributors\x7f141108 +-Node: References\x7f143574 +-Node: GNU Free Documentation License\x7f145315 +-Node: Concept Index\x7f167758 +-Node: Function and Type Index\x7f173677 ++Node: Removed Functions\x7f139253 ++Node: Other Changes\x7f139665 ++Node: Contributors\x7f141194 ++Node: References\x7f143660 ++Node: GNU Free Documentation License\x7f145401 ++Node: Concept Index\x7f167844 ++Node: Function and Type Index\x7f173763 + \x1f + End Tag Table + +diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi +--- mpfr-3.1.0-a/doc/mpfr.texi 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/doc/mpfr.texi 2011-11-28 12:22:52.000000000 +0000 +@@ -3466,8 +3466,9 @@ + a lack of specification. + + @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1. +-Their behavior no longer depends on the platform (assuming this is also +-true for GMP's random generator). As a consequence, the returned values ++Their behavior no longer depends on the platform (assuming this is also true ++for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if ++ at code{gmp_randinit_default} is used). As a consequence, the returned values + can be different between MPFR 3.1 and previous MPFR versions. + Note: as the reproducibility of these functions was not specified + before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p3" ++#define MPFR_VERSION_STRING "3.1.0-p4" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-11-28 12:22:52.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p3"; ++ return "3.1.0-p4"; + } +diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c +--- mpfr-3.1.0-a/tests/trandom.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/trandom.c 2011-11-28 12:22:52.000000000 +0000 +@@ -114,21 +114,29 @@ + mpfr_t x; + gmp_randstate_t s; + ++#if __MPFR_GMP(4,2,0) ++# define C1 "0.895943" ++# define C2 "0.848824" ++#else ++# define C1 "0.479652" ++# define C2 "0.648529" ++#endif ++ + gmp_randinit_default (s); + gmp_randseed_ui (s, 42); + mpfr_init2 (x, 17); + mpfr_urandomb (x, s); +- if (mpfr_cmp_str1 (x, "0.895943") != 0) ++ if (mpfr_cmp_str1 (x, C1) != 0) + { +- printf ("Error in bug20100914, expected 0.895943, got "); ++ printf ("Error in bug20100914, expected " C1 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); + } + mpfr_urandomb (x, s); +- if (mpfr_cmp_str1 (x, "0.848824") != 0) ++ if (mpfr_cmp_str1 (x, C2) != 0) + { +- printf ("Error in bug20100914, expected 0.848824, got "); ++ printf ("Error in bug20100914, expected " C2 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); +diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c +--- mpfr-3.1.0-a/tests/turandom.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/turandom.c 2011-11-28 12:22:52.000000000 +0000 +@@ -160,23 +160,29 @@ + mpfr_t x; + gmp_randstate_t s; + ++#if __MPFR_GMP(4,2,0) ++# define C1 "0.8488312" ++# define C2 "0.8156509" ++#else ++# define C1 "0.6485367" ++# define C2 "0.9362717" ++#endif ++ + gmp_randinit_default (s); + gmp_randseed_ui (s, 42); + mpfr_init2 (x, 17); + mpfr_urandom (x, s, MPFR_RNDN); +- /* the following values are obtained on a 32-bit computer, we should get +- the same values on a 64-bit computer */ +- if (mpfr_cmp_str1 (x, "0.8488312") != 0) ++ if (mpfr_cmp_str1 (x, C1) != 0) + { +- printf ("Error in bug20100914, expected 0.8488312, got "); ++ printf ("Error in bug20100914, expected " C1 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); + } + mpfr_urandom (x, s, MPFR_RNDN); +- if (mpfr_cmp_str1 (x, "0.8156509") != 0) ++ if (mpfr_cmp_str1 (x, C2) != 0) + { +- printf ("Error in bug20100914, expected 0.8156509, got "); ++ printf ("Error in bug20100914, expected " C2 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-02-24 12:44:49.000000000 +0000 +@@ -0,0 +1 @@ ++logging-freeze +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-02-24 12:44:49.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p4 ++3.1.0-p5 +diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c +--- mpfr-3.1.0-a/src/add_d.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add_d.c 2012-02-24 12:44:49.000000000 +0000 +@@ -34,7 +34,7 @@ + (("b[%Pu]=%.*Rg c=%.20g rnd=%d", + mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), + ("a[%Pu]=%.*Rg inexact=%d", +- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); ++ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); + + MPFR_SAVE_EXPO_MARK (expo); + +diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c +--- mpfr-3.1.0-a/src/add_ui.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add_ui.c 2012-02-24 12:44:49.000000000 +0000 +@@ -29,7 +29,7 @@ + MPFR_LOG_FUNC + (("x[%Pu]=%.*Rg u=%d rnd=%d", + mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode), +- ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y)); ++ ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y)); + + if (MPFR_LIKELY(u != 0) ) /* if u=0, do nothing */ + { +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p4" ++#define MPFR_VERSION_STRING "3.1.0-p5" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c +--- mpfr-3.1.0-a/src/mul_d.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mul_d.c 2012-02-24 12:44:49.000000000 +0000 +@@ -34,7 +34,7 @@ + (("b[%Pu]=%.*Rg c=%.20g rnd=%d", + mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), + ("a[%Pu]=%.*Rg inexact=%d", +- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); ++ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); + + MPFR_SAVE_EXPO_MARK (expo); + +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-02-24 12:44:49.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p4"; ++ return "3.1.0-p5"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-02-24 13:50:05.000000000 +0000 +@@ -0,0 +1 @@ ++logging-varfmt +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-02-24 13:50:05.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p5 ++3.1.0-p6 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 +@@ -1592,7 +1592,7 @@ + do \ + if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) && \ + (mpfr_log_current <= mpfr_log_level)) \ +- LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__, \ ++ LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__, \ + #x, mpfr_get_prec (x), mpfr_log_prec, x); \ + while (0) + +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p5" ++#define MPFR_VERSION_STRING "3.1.0-p6" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-02-24 13:50:05.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p5"; ++ return "3.1.0-p6"; + } diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 6876d6f..c3df710 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -4,7 +4,7 @@ # ############################################################# -MPFR_VERSION = 3.0.1 +MPFR_VERSION = 3.1.0 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.bz2 MPFR_INSTALL_STAGING = YES -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 15/20] mpfr: bump to version 3.1.0-p6 2012-03-11 21:48 ` [Buildroot] [PATCH 15/20] mpfr: bump to version 3.1.0-p6 Gustavo Zacarias @ 2012-03-11 22:58 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:58 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 16/20] grep: bump to version 2.11 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (13 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 15/20] mpfr: bump to version 3.1.0-p6 Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:20 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 17/20] file: bump to version 5.11 Gustavo Zacarias ` (4 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/grep/grep.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/grep/grep.mk b/package/grep/grep.mk index a4391d7..aa22910 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ############################################################# -GREP_VERSION = 2.10 +GREP_VERSION = 2.11 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_CONF_OPT = --disable-perl-regexp --without-included-regex -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 16/20] grep: bump to version 2.11 2012-03-11 21:48 ` [Buildroot] [PATCH 16/20] grep: bump to version 2.11 Gustavo Zacarias @ 2012-03-11 22:20 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:20 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 17/20] file: bump to version 5.11 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (14 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 16/20] grep: bump to version 2.11 Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:21 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 18/20] wipe: bump to version 2.3.1 and switch to sourceforge Gustavo Zacarias ` (3 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/file/file.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/file/file.mk b/package/file/file.mk index bb1b6bd..c9846e4 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ############################################################# -FILE_VERSION = 5.10 +FILE_VERSION = 5.11 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 17/20] file: bump to version 5.11 2012-03-11 21:48 ` [Buildroot] [PATCH 17/20] file: bump to version 5.11 Gustavo Zacarias @ 2012-03-11 22:21 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:21 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 18/20] wipe: bump to version 2.3.1 and switch to sourceforge 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (15 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 17/20] file: bump to version 5.11 Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:22 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 Gustavo Zacarias ` (2 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot The original version is gone, so switch to sourceforge wipe and bump to version 2.3.1 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/wipe/Config.in | 2 +- package/wipe/wipe-dont-force-lfs.patch | 16 ++++++++++++++++ package/wipe/wipe.mk | 24 +++++------------------- 3 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 package/wipe/wipe-dont-force-lfs.patch diff --git a/package/wipe/Config.in b/package/wipe/Config.in index a053a72..0241c13 100644 --- a/package/wipe/Config.in +++ b/package/wipe/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_WIPE Wipe is a little command for securely erasing files from magnetic media. It compiles under various unix platforms. - http://lambda-diode.com/software/wipe + http://wipe.sourceforge.net diff --git a/package/wipe/wipe-dont-force-lfs.patch b/package/wipe/wipe-dont-force-lfs.patch new file mode 100644 index 0000000..08916e2 --- /dev/null +++ b/package/wipe/wipe-dont-force-lfs.patch @@ -0,0 +1,16 @@ +LARGEFILE support shouldn't be forced into CFLAGS + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura wipe-2.3.1/configure.in wipe-2.3.1-lfs/configure.in +--- wipe-2.3.1/configure.in 2009-06-15 22:55:11.000000000 -0300 ++++ wipe-2.3.1-lfs/configure.in 2012-03-05 11:25:30.463221948 -0300 +@@ -91,7 +91,7 @@ + test "$with_efence" = "yes" && temp2CFLAGS="$debugCFLAGS" && LIBS="-lefence" + + DEBUG="$debugCFLAGS $fullCFLAGS" +-fullCFLAGS="$temp2CFLAGS $fullCFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ++fullCFLAGS="$temp2CFLAGS $fullCFLAGS" + CFLAGS="$checkCFLAGS -D__USE_BSD -D_BSD_SOURCE -D__USE_POSIX -D_POSIX_SOURCE -D_POSIX_MAPPED_FILES" + + dnl Checks for libraries. diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk index 54283f9..ec1b692 100644 --- a/package/wipe/wipe.mk +++ b/package/wipe/wipe.mk @@ -4,20 +4,10 @@ # ############################################################# -WIPE_VERSION = 0.22 -WIPE_SITE = http://lambda-diode.com/resources/wipe -WIPE_CFLAGS = $(TARGET_CFLAGS) -DHAVE_DEV_URANDOM -DHAVE_OSYNC -DHAVE_STRCASECMP -DHAVE_RANDOM -DSYNC_WAITS_FOR_SYNC -DFIND_DEVICE_SIZE_BY_BLKGETSIZE - -ifeq ($(BR2_LARGEFILE),y) -WIPE_CFLAGS += -DSIXTYFOUR -endif - -define WIPE_BUILD_CMDS - # Fix busted git version logic - $(SED) "s/which/!which/" $(@D)/Makefile - $(MAKE) -C $(@D) linux CC_LINUX="$(TARGET_CC)" \ - CCO_LINUX="$(WIPE_CFLAGS)" -endef +WIPE_VERSION = 2.3.1 +WIPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/wipe +WIPE_SOURCE = wipe-$(WIPE_VERSION).tar.bz2 +WIPE_AUTORECONF = YES define WIPE_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/wipe $(TARGET_DIR)/usr/bin/wipe @@ -29,8 +19,4 @@ define WIPE_UNINSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/usr/share/man/man1/wipe.1 endef -define WIPE_CLEAN_CMDS - $(MAKE) -C $(@D) clean -endef - -$(eval $(call GENTARGETS)) +$(eval $(call AUTOTARGETS)) -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 18/20] wipe: bump to version 2.3.1 and switch to sourceforge 2012-03-11 21:48 ` [Buildroot] [PATCH 18/20] wipe: bump to version 2.3.1 and switch to sourceforge Gustavo Zacarias @ 2012-03-11 22:22 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:22 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> The original version is gone, so switch to sourceforge wipe Gustavo> and bump to version 2.3.1 Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (16 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 18/20] wipe: bump to version 2.3.1 and switch to sourceforge Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:25 ` Peter Korsgaard 2012-03-13 23:36 ` Arnout Vandecappelle 2012-03-11 21:48 ` [Buildroot] [PATCH 20/20] alsa-utils: " Gustavo Zacarias 2012-03-11 22:02 ` [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Peter Korsgaard 19 siblings, 2 replies; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- ...nline.patch => alsa-lib-avr32-bad-inline.patch} | 0 package/multimedia/alsa-lib/alsa-lib.mk | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) rename package/multimedia/alsa-lib/{alsa-lib-1.0.18-avr32-bad-inline.patch => alsa-lib-avr32-bad-inline.patch} (100%) diff --git a/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch b/package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch similarity index 100% rename from package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch rename to package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index aa6ca51..d02bbda 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -3,18 +3,24 @@ # alsa-lib # ############################################################# -ALSA_LIB_VERSION = 1.0.24.1 + +ALSA_LIB_VERSION = 1.0.25 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib ALSA_LIB_INSTALL_STAGING = YES - ALSA_LIB_CFLAGS=$(TARGET_CFLAGS) - ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \ --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \ --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \ --without-versioned +# Can't build with static & shared at the same time (1.0.25+) +ifneq ($(BR2_PREFER_STATIC),y) +ALSA_LIB_CONF_OPT += --enable-static=no +else +ALSA_LIB_CONF_OPT += --enable-shared=no +endif + ifneq ($(BR2_PACKAGE_ALSA_LIB_ALOAD),y) ALSA_LIB_CONF_OPT += --disable-aload endif -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-11 21:48 ` [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 Gustavo Zacarias @ 2012-03-11 22:25 ` Peter Korsgaard 2012-03-13 23:36 ` Arnout Vandecappelle 1 sibling, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:25 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Gustavo> --- Gustavo> ...nline.patch => alsa-lib-avr32-bad-inline.patch} | 0 Gustavo> package/multimedia/alsa-lib/alsa-lib.mk | 12 +++++++++--- Gustavo> 2 files changed, 9 insertions(+), 3 deletions(-) Gustavo> rename package/multimedia/alsa-lib/{alsa-lib-1.0.18-avr32-bad-inline.patch => alsa-lib-avr32-bad-inline.patch} (100%) Gustavo> diff --git a/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch b/package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch Gustavo> similarity index 100% Gustavo> rename from package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch Gustavo> rename to package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch Gustavo> diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk Gustavo> index aa6ca51..d02bbda 100644 Gustavo> --- a/package/multimedia/alsa-lib/alsa-lib.mk Gustavo> +++ b/package/multimedia/alsa-lib/alsa-lib.mk Gustavo> @@ -3,18 +3,24 @@ Gustavo> # alsa-lib Gustavo> # Gustavo> ############################################################# Gustavo> -ALSA_LIB_VERSION = 1.0.24.1 Gustavo> + Gustavo> +ALSA_LIB_VERSION = 1.0.25 Gustavo> ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 Gustavo> ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib Gustavo> ALSA_LIB_INSTALL_STAGING = YES Gustavo> - Gustavo> ALSA_LIB_CFLAGS=$(TARGET_CFLAGS) Gustavo> - Gustavo> ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \ Gustavo> --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \ Gustavo> --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \ Gustavo> --without-versioned Gustavo> +# Can't build with static & shared at the same time (1.0.25+) Gustavo> +ifneq ($(BR2_PREFER_STATIC),y) Gustavo> +ALSA_LIB_CONF_OPT += --enable-static=no Gustavo> +else Gustavo> +ALSA_LIB_CONF_OPT += --enable-shared=no Gustavo> +endif I swapped this around to use positive logic and committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-11 21:48 ` [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 Gustavo Zacarias 2012-03-11 22:25 ` Peter Korsgaard @ 2012-03-13 23:36 ` Arnout Vandecappelle 2012-03-14 14:27 ` Gustavo Zacarias 2012-03-15 20:30 ` Thomas Petazzoni 1 sibling, 2 replies; 50+ messages in thread From: Arnout Vandecappelle @ 2012-03-13 23:36 UTC (permalink / raw) To: buildroot On Sunday 11 March 2012 22:48:08 Gustavo Zacarias wrote: > +# Can't build with static & shared at the same time (1.0.25+) > +ifneq ($(BR2_PREFER_STATIC),y) > +ALSA_LIB_CONF_OPT += --enable-static=no > +else > +ALSA_LIB_CONF_OPT += --enable-shared=no > +endif Shouldn't we put this in AUTOTARGETS? Or at least the --enable-shared=no if BR2_PREFER_STATIC? Regards, Arnout -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286540 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-13 23:36 ` Arnout Vandecappelle @ 2012-03-14 14:27 ` Gustavo Zacarias 2012-03-15 20:30 ` Thomas Petazzoni 1 sibling, 0 replies; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-14 14:27 UTC (permalink / raw) To: buildroot On 2012-03-13 20:36, Arnout Vandecappelle wrote: >> +# Can't build with static & shared at the same time (1.0.25+) >> +ifneq ($(BR2_PREFER_STATIC),y) >> +ALSA_LIB_CONF_OPT += --enable-static=no >> +else >> +ALSA_LIB_CONF_OPT += --enable-shared=no >> +endif > > Shouldn't we put this in AUTOTARGETS? Or at least the > --enable-shared=no if BR2_PREFER_STATIC? > > Regards, > Arnout We could try, though i expect some trouble to arise, for example the new dnsmasq with lua support only links against static liblua. There are probably others that have a flaky build system. Regards. ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-13 23:36 ` Arnout Vandecappelle 2012-03-14 14:27 ` Gustavo Zacarias @ 2012-03-15 20:30 ` Thomas Petazzoni 2012-03-15 20:51 ` Gustavo Zacarias 1 sibling, 1 reply; 50+ messages in thread From: Thomas Petazzoni @ 2012-03-15 20:30 UTC (permalink / raw) To: buildroot Le Wed, 14 Mar 2012 00:36:05 +0100, Arnout Vandecappelle <arnout@mind.be> a ?crit : > On Sunday 11 March 2012 22:48:08 Gustavo Zacarias wrote: > > +# Can't build with static & shared at the same time (1.0.25+) > > +ifneq ($(BR2_PREFER_STATIC),y) > > +ALSA_LIB_CONF_OPT += --enable-static=no > > +else > > +ALSA_LIB_CONF_OPT += --enable-shared=no > > +endif > > Shouldn't we put this in AUTOTARGETS? Or at least the > --enable-shared=no if BR2_PREFER_STATIC? We already have in package/Makefile.in: ifeq ($(BR2_PREFER_STATIC_LIB),y) SHARED_STATIC_LIBS_OPTS=--enable-static --disable-shared else SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared endif And SHARED_STATIC_LIB_OPTS is used in package/Makefile.autotools.in. I am not sure why alsa-lib requires those different options than the standard ones. Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-15 20:30 ` Thomas Petazzoni @ 2012-03-15 20:51 ` Gustavo Zacarias 2012-03-15 21:05 ` Thomas Petazzoni 2012-03-15 22:55 ` Arnout Vandecappelle 0 siblings, 2 replies; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-15 20:51 UTC (permalink / raw) To: buildroot On 2012-03-15 17:30, Thomas Petazzoni wrote: > ifeq ($(BR2_PREFER_STATIC_LIB),y) > SHARED_STATIC_LIBS_OPTS=--enable-static --disable-shared > else > SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared > endif > > And SHARED_STATIC_LIB_OPTS is used in package/Makefile.autotools.in. > I > am not sure why alsa-lib requires those different options than the > standard ones. > > Thomas Because it doesn't build with both static & shared set starting with version 1.0.25, the configure script just errors out complaining about some libtool issues about building both. Regards. ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-15 20:51 ` Gustavo Zacarias @ 2012-03-15 21:05 ` Thomas Petazzoni 2012-03-15 21:11 ` Gustavo Zacarias 2012-03-15 22:55 ` Arnout Vandecappelle 1 sibling, 1 reply; 50+ messages in thread From: Thomas Petazzoni @ 2012-03-15 21:05 UTC (permalink / raw) To: buildroot Le Thu, 15 Mar 2012 17:51:42 -0300, Gustavo Zacarias <gustavo@zacarias.com.ar> a ?crit : > Because it doesn't build with both static & shared set starting with > version 1.0.25, the configure script just errors out complaining about > some libtool issues about building both. Ok, thanks. This is odd, is it a new libtool behaviour? Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-15 21:05 ` Thomas Petazzoni @ 2012-03-15 21:11 ` Gustavo Zacarias 0 siblings, 0 replies; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-15 21:11 UTC (permalink / raw) To: buildroot On 2012-03-15 18:05, Thomas Petazzoni wrote: > Le Thu, 15 Mar 2012 17:51:42 -0300, > Gustavo Zacarias <gustavo@zacarias.com.ar> a ?crit : > >> Because it doesn't build with both static & shared set starting with >> version 1.0.25, the configure script just errors out complaining >> about >> some libtool issues about building both. > > Ok, thanks. This is odd, is it a new libtool behaviour? > > Thomas I don't think so, they're still using libtool 1.5.22 for alsa-lib so i guess it's an old/new problem that they're not fixing by upgrading to libtool 2.x. Regards. ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-15 20:51 ` Gustavo Zacarias 2012-03-15 21:05 ` Thomas Petazzoni @ 2012-03-15 22:55 ` Arnout Vandecappelle 2012-03-15 23:09 ` Gustavo Zacarias 1 sibling, 1 reply; 50+ messages in thread From: Arnout Vandecappelle @ 2012-03-15 22:55 UTC (permalink / raw) To: buildroot On Thursday 15 March 2012 21:51:42 Gustavo Zacarias wrote: > > ifeq ($(BR2_PREFER_STATIC_LIB),y) > > SHARED_STATIC_LIBS_OPTS=--enable-static --disable-shared > > else > > SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared > > endif > > > > And SHARED_STATIC_LIB_OPTS is used in package/Makefile.autotools.in. > > I > > am not sure why alsa-lib requires those different options than the > > standard ones. > > > > Thomas > > Because it doesn't build with both static & shared set starting with > version 1.0.25, the configure script just errors out complaining about > some libtool issues about building both. But the --enable-shared=n in case BR2_PREFER_STATIC_LIB is enabled is probably redundant, right? Regards, Arnout -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286540 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 2012-03-15 22:55 ` Arnout Vandecappelle @ 2012-03-15 23:09 ` Gustavo Zacarias 0 siblings, 0 replies; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-15 23:09 UTC (permalink / raw) To: buildroot On 2012-03-15 19:55, Arnout Vandecappelle wrote: > But the --enable-shared=n in case BR2_PREFER_STATIC_LIB is enabled > is > probably redundant, right? > > Regards, > Arnout Yeah that's true. Regards. ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 20/20] alsa-utils: bump to version 1.0.25 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (17 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 Gustavo Zacarias @ 2012-03-11 21:48 ` Gustavo Zacarias 2012-03-11 22:22 ` Peter Korsgaard 2012-03-11 22:02 ` [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Peter Korsgaard 19 siblings, 1 reply; 50+ messages in thread From: Gustavo Zacarias @ 2012-03-11 21:48 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- .../alsa-utils/alsa-utils-exp10-workaround.patch | 33 -------------------- package/multimedia/alsa-utils/alsa-utils.mk | 3 +- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch diff --git a/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch b/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch deleted file mode 100644 index f4a520a..0000000 --- a/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch +++ /dev/null @@ -1,33 +0,0 @@ -From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <jacmet@sunsite.dk> -Date: Mon, 14 Mar 2011 09:19:18 +0100 -Subject: [PATCH] alsamixer: fix build on uClibc - -exp10 is a glibc extension, which isn't supported on uClibc. Luckily, -exp10() is trivial to compute based on exp(), so add a wrapper for -the uClibc case. - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - alsamixer/volume_mapping.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c -index 9cacad8..1c0d7c4 100644 ---- a/alsamixer/volume_mapping.c -+++ b/alsamixer/volume_mapping.c -@@ -37,6 +37,11 @@ - #include <stdbool.h> - #include "volume_mapping.h" - -+#ifdef __UCLIBC__ -+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ -+#define exp10(x) (exp((x) * log(10))) -+#endif /* __UCLIBC__ */ -+ - #define MAX_LINEAR_DB_SCALE 24 - - static inline bool use_linear_dB_scale(long dBmin, long dBmax) --- -1.7.2.3 - diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index 59579c2..744ec85 100644 --- a/package/multimedia/alsa-utils/alsa-utils.mk +++ b/package/multimedia/alsa-utils/alsa-utils.mk @@ -3,7 +3,8 @@ # alsa-utils # ############################################################# -ALSA_UTILS_VERSION = 1.0.24.2 + +ALSA_UTILS_VERSION = 1.0.25 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils ALSA_UTILS_INSTALL_STAGING = YES -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 20/20] alsa-utils: bump to version 1.0.25 2012-03-11 21:48 ` [Buildroot] [PATCH 20/20] alsa-utils: " Gustavo Zacarias @ 2012-03-11 22:22 ` Peter Korsgaard 0 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:22 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias ` (18 preceding siblings ...) 2012-03-11 21:48 ` [Buildroot] [PATCH 20/20] alsa-utils: " Gustavo Zacarias @ 2012-03-11 22:02 ` Peter Korsgaard 19 siblings, 0 replies; 50+ messages in thread From: Peter Korsgaard @ 2012-03-11 22:02 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 50+ messages in thread
end of thread, other threads:[~2012-03-15 23:09 UTC | newest] Thread overview: 50+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-03-11 21:47 [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Gustavo Zacarias 2012-03-11 21:47 ` [Buildroot] [PATCH 02/20] gmp: bump to version 5.0.4 Gustavo Zacarias 2012-03-11 22:03 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 03/20] mpd: bump to version 0.16.7 Gustavo Zacarias 2012-03-11 22:06 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 04/20] util-linux: bump to version 2.20.1 Gustavo Zacarias 2012-03-11 22:10 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 05/20] radvd: bump version to 1.8.5 Gustavo Zacarias 2012-03-11 22:11 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 06/20] usbutils: bump version to 005 Gustavo Zacarias 2012-03-11 22:12 ` Peter Korsgaard 2012-03-11 22:35 ` Gustavo Zacarias 2012-03-11 23:05 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 07/20] ntfs-3g: bump to version 2012.1.15 Gustavo Zacarias 2012-03-11 22:12 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 08/20] ntfsprogs: remove deprecated Gustavo Zacarias 2012-03-11 22:13 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 09/20] libnl: bump to version 3.2.7 Gustavo Zacarias 2012-03-11 22:14 ` Peter Korsgaard 2012-03-11 21:47 ` [Buildroot] [PATCH 10/20] nbd: bump to version 3.0 Gustavo Zacarias 2012-03-11 22:19 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 11/20] smartmontools: bump to version 5.42 Gustavo Zacarias 2012-03-11 22:14 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 12/20] libfuse: bump to version 2.8.7 Gustavo Zacarias 2012-03-11 22:14 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 13/20] hdparm: bump to version 9.39 Gustavo Zacarias 2012-03-11 22:19 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 14/20] sysstat: bump to version 10.0.3 Gustavo Zacarias 2012-03-11 22:20 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 15/20] mpfr: bump to version 3.1.0-p6 Gustavo Zacarias 2012-03-11 22:58 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 16/20] grep: bump to version 2.11 Gustavo Zacarias 2012-03-11 22:20 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 17/20] file: bump to version 5.11 Gustavo Zacarias 2012-03-11 22:21 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 18/20] wipe: bump to version 2.3.1 and switch to sourceforge Gustavo Zacarias 2012-03-11 22:22 ` Peter Korsgaard 2012-03-11 21:48 ` [Buildroot] [PATCH 19/20] alsa-lib: bump to version 1.0.25 Gustavo Zacarias 2012-03-11 22:25 ` Peter Korsgaard 2012-03-13 23:36 ` Arnout Vandecappelle 2012-03-14 14:27 ` Gustavo Zacarias 2012-03-15 20:30 ` Thomas Petazzoni 2012-03-15 20:51 ` Gustavo Zacarias 2012-03-15 21:05 ` Thomas Petazzoni 2012-03-15 21:11 ` Gustavo Zacarias 2012-03-15 22:55 ` Arnout Vandecappelle 2012-03-15 23:09 ` Gustavo Zacarias 2012-03-11 21:48 ` [Buildroot] [PATCH 20/20] alsa-utils: " Gustavo Zacarias 2012-03-11 22:22 ` Peter Korsgaard 2012-03-11 22:02 ` [Buildroot] [PATCH 01/20] squid: bump to version 3.1.19 Peter Korsgaard
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.