[packages/varnish] - sysctl is not needed on linux and breaks build on x32 - rel 3

baggins baggins at pld-linux.org
Mon Dec 21 19:48:22 CET 2015


commit 1388570acd876829f8f3b001e60be7aac9b7fded
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Dec 21 19:48:02 2015 +0100

    - sysctl is not needed on linux and breaks build on x32
    - rel 3

 no-sysctl.patch | 10 ++++++++++
 varnish.spec    |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/varnish.spec b/varnish.spec
index b0d621f..a8fa292 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -11,7 +11,7 @@ Summary:	Varnish - a high-performance HTTP accelerator
 Summary(pl.UTF-8):	Varnish - wydajny akcelerator HTTP
 Name:		varnish
 Version:	3.0.5
-Release:	2
+Release:	3
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
@@ -24,6 +24,7 @@ Source6:	%{name}.logrotate
 Source8:	%{name}.tmpfiles
 #Patch100:	branch.diff
 Patch0:		no-ccache.patch
+Patch1:		no-sysctl.patch
 URL:		http://www.varnish-cache.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -113,6 +114,7 @@ Source code of Varnish for building VMODs.
 %setup -q
 #%patch100 -p0
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
 #%{__sed} -i -e 's,$(srcdir)/,,' bin/varnishtest/Makefile.am
diff --git a/no-sysctl.patch b/no-sysctl.patch
new file mode 100644
index 0000000..68aa933
--- /dev/null
+++ b/no-sysctl.patch
@@ -0,0 +1,10 @@
+--- varnish-3.0.5/lib/libjemalloc/jemalloc_linux.c~	2013-12-02 08:47:57.000000000 +0100
++++ varnish-3.0.5/lib/libjemalloc/jemalloc_linux.c	2015-12-21 19:43:26.891965305 +0100
+@@ -177,7 +177,6 @@
+ #include <sys/param.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #include <sys/uio.h>
+ 
+ #include <errno.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/varnish.git/commitdiff/1388570acd876829f8f3b001e60be7aac9b7fded



More information about the pld-cvs-commit mailing list