Hello community,
here is the log from the commit of package pixz for openSUSE:Factory checked in
at 2013-12-18 07:51:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pixz (Old)
and /work/SRC/openSUSE:Factory/.pixz.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pixz"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pixz/pixz.changes 2013-01-10
13:51:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pixz.new/pixz.changes 2013-12-18
07:51:51.000000000 +0100
@@ -1,0 +2,8 @@
+Sun Nov 24 16:32:31 UTC 2013 - andreas.stie...@gmx.de
+
+- support building on CentOS/RHEL, statically linking against
+ libarchive and xz (pixz-use-static.patch)
+ and patching in missing endianess functions
+ (pixz-endianess-functions.patch)
+
+-------------------------------------------------------------------
New:
----
pixz-endianess-functions.patch
pixz-use-static.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pixz.spec ++++++
--- /var/tmp/diff_new_pack.WBumyi/_old 2013-12-18 07:51:51.000000000 +0100
+++ /var/tmp/diff_new_pack.WBumyi/_new 2013-12-18 07:51:51.000000000 +0100
@@ -16,6 +16,14 @@
#
+%if 0%{?centos_version} || 0%{?rhel_version}
+%define use_static_libs 1
+%define patch_missing_endianess_functions 1
+%else
+%define use_static_libs 0
+%define patch_missing_endianess_functions 0
+%endif
+
Name: pixz
Version: 1.0.2
Release: 0
@@ -25,8 +33,16 @@
Url: https://github.com/vasi/pixz
Source: http://sourceforge.net/projects/pixz/files/pixz-%{version}.tgz
Patch1: pixz-underlinking.patch
+Patch2: pixz-use-static.patch
+Patch3: pixz-endianess-functions.patch
+%if 0%{?use_static_libs}
+BuildRequires: libarchive-static-devel >= 2.8
+BuildRequires: xz-static-devel >= 4.999.9-beta-212
+%else
BuildRequires: libarchive-devel
BuildRequires: xz-devel
+%endif
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -40,6 +56,12 @@
%prep
%setup -q
%patch1 -p1
+%if 0%{?use_static_libs}
+%patch2 -p1
+%endif
+%if 0%{?patch_missing_endianess_functions}
+%patch3 -p1
+%endif
%build
make %{?_smp_mflags} CFLAGS="%{optflags}"
++++++ pixz-endianess-functions.patch ++++++
---
endian.c | 8 ++++++++
1 file changed, 8 insertions(+)
Index: pixz-1.0.2/endian.c
===================================================================
--- pixz-1.0.2.orig/endian.c 2013-01-09 04:25:03.000000000 +0000
+++ pixz-1.0.2/endian.c 2013-09-26 20:02:24.000000000 +0100
@@ -19,6 +19,14 @@ void xle64enc(uint8_t *d, uint64_t n) {
#include <sys/endian.h>
#endif
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+# define htole64(x) (x)
+# define le64toh(x) (x)
+# else
+# define htole64(x) __bswap_64 (x)
+# define le64toh(x) __bswap_64 (x)
+# endif
+
uint64_t xle64dec(const uint8_t *d) {
return le64toh(*(uint64_t*)d);
}
++++++ pixz-use-static.patch ++++++
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pixz-1.0.2/Makefile
===================================================================
--- pixz-1.0.2.orig/Makefile 2013-09-25 22:16:11.000000000 +0100
+++ pixz-1.0.2/Makefile 2013-09-26 00:29:52.000000000 +0100
@@ -12,7 +12,7 @@ MYCFLAGS = $(patsubst %,-I%/include,$(LI
MYLDFLAGS = $(patsubst %,-L%/lib,$(LIBPREFIX)) $(OPT) -Wall
THREADS = -lpthread
-LIBADD = $(THREADS) -llzma -larchive -lm
+LIBADD = $(THREADS) -Wl,-Bstatic -llzma -larchive -Wl,-Bdynamic -lm
CC = gcc
COMPILE = $(CC) $(MYCFLAGS) $(CFLAGS) -c -o
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
