rpms/varnish/EL-4 varnish.s390x_pagesize.patch, NONE, 1.1 varnish.sparc_pagesize.patch, NONE, 1.1 varnish.spec, 1.18, 1.19
Ingvar Hagelund
ingvar at fedoraproject.org
Thu Aug 20 11:25:39 UTC 2009
Author: ingvar
Update of /cvs/pkgs/rpms/varnish/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14419
Modified Files:
varnish.spec
Added Files:
varnish.s390x_pagesize.patch varnish.sparc_pagesize.patch
Log Message:
Added arch specific patches to jemalloc.
varnish.s390x_pagesize.patch:
jemalloc_linux.c | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE varnish.s390x_pagesize.patch ---
diff -Naur ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c ./lib/libjemalloc/jemalloc_linux.c
--- ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c 2009-02-12 12:15:24.000000000 +0100
+++ ./lib/libjemalloc/jemalloc_linux.c 2009-06-04 15:27:34.000000000 +0200
@@ -272,6 +272,11 @@
# define QUANTUM_2POW 4
# define SIZEOF_PTR_2POW 2
#endif
+#ifdef __s390x__
+# define PAGESIZE_2POW 12
+# define QUANTUM_2POW 4
+# define SIZEOF_PTR_2POW 3
+#endif
#define QUANTUM ((size_t)(1U << QUANTUM_2POW))
#define QUANTUM_MASK (QUANTUM - 1)
varnish.sparc_pagesize.patch:
jemalloc_linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE varnish.sparc_pagesize.patch ---
--- lib/libjemalloc/jemalloc_linux.c.old 2009-08-14 10:38:53.783906580 +0200
+++ lib/libjemalloc/jemalloc_linux.c 2009-08-14 10:39:04.215906982 +0200
@@ -243,7 +243,7 @@
# define SIZEOF_PTR_2POW 3
# define NO_TLS
#endif
-#ifdef __sparc64__
+#ifdef __sparc__
# define PAGESIZE_2POW 13
# define QUANTUM_2POW 4
# define SIZEOF_PTR_2POW 3
Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-4/varnish.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- varnish.spec 15 Apr 2009 13:30:10 -0000 1.18
+++ varnish.spec 20 Aug 2009 11:25:39 -0000 1.19
@@ -1,12 +1,14 @@
Summary: High-performance HTTP accelerator
Name: varnish
Version: 2.0.4
-Release: 1%{?dist}
+Release: 4%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.varnish-cache.org/
Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.s390x_pagesize.patch
+Patch2: varnish.sparc_pagesize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# The svn sources needs autoconf, automake and libtool to generate a suitable
# configure script. Release tarballs would not need this
@@ -69,6 +71,8 @@ Varnish is a high-performance HTTP accel
#./autogen.sh
%patch0 -p0
+%patch1 -p0
+%patch2 -p0
# Hack to get 32- and 64-bits tests run concurrently on the same build machine
case `uname -m` in
@@ -91,7 +95,7 @@ cp bin/varnishd/default.vcl etc/zope-plo
%build
# Remove "--disable static" if you want to build static libraries
-# jemalloc is not compatible with Red Hat's ppc64 RHEL5 kernel koji server :-(
+# jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
%ifarch ppc64 ppc
%configure --disable-static --localstatedir=/var/lib --disable-jemalloc
%else
@@ -235,6 +239,15 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
+* Thu Aug 13 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-4
+- Added a sparc specific patch to libjemalloc.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 04 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-2
+- Added a s390 specific patch to libjemalloc.
+
* Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
New upstream release 2.0.4
More information about the fedora-extras-commits
mailing list