- fix build on x32

- rel 2

diff --git a/lxc.spec b/lxc.spec
index 1e04ee6e7d264614ec3f57dc3cd92daee7d122dd..47880cef4587b4a75bcef4c0d0e6dc591ae34bd0 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -14,7 +14,7 @@ Summary:      Linux Containers userspace tools
 Summary(pl.UTF-8):     Narzędzia do kontenerów linuksowych (LXC)
 Name:          lxc
 Version:       2.0.8
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         Applications/System
 Source0:       https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz
@@ -25,6 +25,7 @@ Source2:      %{name}_macvlan.sysconfig
 Source3:       %{name}_macvlan
 Patch0:                %{name}-pld.patch
 Patch1:                %{name}-net.patch
+Patch2:                x32.patch
 URL:           https://www.linuxcontainers.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -160,6 +161,7 @@ bashowe uzupełnianie nazw dla LXC.
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 cp -p %{SOURCE1} templates/lxc-pld.in
 

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..fd93b54
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,14 @@
+--- lxc-2.0.8/src/lxc/log.c~   2017-05-11 19:23:06.000000000 +0200
++++ lxc-2.0.8/src/lxc/log.c    2017-05-27 21:36:35.137755023 +0200
+@@ -154,7 +154,11 @@
+       seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
+ 
+       /* Make string from nanoseconds. */
++#ifdef __ILP32__
++      ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%lld", time->tv_nsec);
++#else
+       ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%ld", time->tv_nsec);
++#endif
+       if (ret < 0 || ret >= LXC_NUMSTRLEN64)
+               return -1;
+