[packages/busybox] - fix building on x32 - rel 5
baggins
baggins at pld-linux.org
Thu Feb 26 19:28:25 CET 2015
commit aad3a7f380c6142ae656302441b6f47672944bdb
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Feb 26 18:28:08 2015 +0000
- fix building on x32
- rel 5
busybox.spec | 4 +++-
x32.patch | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/busybox.spec b/busybox.spec
index 8b562cb..6940a20 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -38,7 +38,7 @@ Summary(pt_BR.UTF-8): BusyBox é um conjunto de utilitários UNIX em um único b
Name: busybox
# stable line only
Version: 1.22.1
-Release: 4
+Release: 5
License: GPL v2
Group: Applications
Source0: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
@@ -58,6 +58,7 @@ Patch104: http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-lzop.patch
# Patch104-md5: 14fb3bf7ffaba153b3cad385677b18c3
Patch105: http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-zcat-no-ext.patch
# Patch105-md5: 158c8c4c73db6d920bdd7d4b9b65b2a5
+Patch0: x32.patch
Patch1: %{name}-logconsole.patch
Patch2: %{name}-printf-gettext.patch
Patch3: %{name}-loadfont.patch
@@ -168,6 +169,7 @@ Statycznie skonsolidowany busybox dla initrd.
%patch101 -p1
%patch102 -p1
%patch103 -p1
+%patch0 -p1
%patch1 -p1
%patch2 -p1
#%patch3 -p1
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..0be941e
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,24 @@
+--- busybox-1.22.1/include/libbb.h.orig 2015-01-26 19:38:58.762414035 +0000
++++ busybox-1.22.1/include/libbb.h 2015-01-26 19:39:20.749079926 +0000
+@@ -232,6 +232,13 @@
+ #else
+ /* CONFIG_LFS is off */
+ # if UINT_MAX == 0xffffffff
++#ifdef __ILP32__
++typedef unsigned long long uoff_t;
++# define XATOOFF(a) xatoull_range((a), 0, LLONG_MAX)
++# define BB_STRTOOFF bb_strtoull
++# define STRTOOFF strtoull
++# define OFF_FMT "ll"
++#else
+ /* While sizeof(off_t) == sizeof(int), off_t is typedef'ed to long anyway.
+ * gcc will throw warnings on printf("%d", off_t). Crap... */
+ typedef unsigned long uoff_t;
+@@ -239,6 +246,7 @@
+ # define BB_STRTOOFF bb_strtou
+ # define STRTOOFF strtol
+ # define OFF_FMT "l"
++#endif
+ # else
+ typedef unsigned long uoff_t;
+ # define XATOOFF(a) xatoul_range((a), 0, LONG_MAX)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/busybox.git/commitdiff/aad3a7f380c6142ae656302441b6f47672944bdb
More information about the pld-cvs-commit
mailing list