[packages/apache-mod_spdy] system zlib patch from gentoo
glen
glen at pld-linux.org
Mon Dec 9 21:34:16 CET 2013
commit 7139bb6c2e1bb7ebb4f13067f83be64d3d605f85
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Dec 9 22:33:47 2013 +0200
system zlib patch from gentoo
apache-mod_spdy.spec | 4 +++-
system-zlib.patch | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/apache-mod_spdy.spec b/apache-mod_spdy.spec
index ded1b95..f0e5806 100644
--- a/apache-mod_spdy.spec
+++ b/apache-mod_spdy.spec
@@ -4,7 +4,7 @@
%define mod_name spdy
%define apxs %{_sbindir}/apxs
-Summary: Apache 2 module to enable SPDY support
+Summary: Apache module to enable SPDY support
Name: apache-mod_%{mod_name}
Version: 0.9.3.3
Release: 1
@@ -17,6 +17,7 @@ Source2: gclient.conf
Patch0: gyp.patch
Patch1: log-constants.patch
Patch2: apache2.4.patch
+Patch3: system-zlib.patch
URL: http://code.google.com/p/mod-spdy/
BuildRequires: %{apxs}
BuildRequires: apache-devel >= 2.2
@@ -38,6 +39,7 @@ the SPDY protocol for serving HTTP resources.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
CC="%{__cc}" \
diff --git a/system-zlib.patch b/system-zlib.patch
new file mode 100644
index 0000000..7975668
--- /dev/null
+++ b/system-zlib.patch
@@ -0,0 +1,39 @@
+--- src/third_party/zlib/zlib.gyp
++++ src/third_party/zlib/zlib.gyp
+@@ -81,14 +81,6 @@
+ 'defines': [
+ 'USE_SYSTEM_ZLIB',
+ ],
+- 'sources': [
+- 'contrib/minizip/ioapi.c',
+- 'contrib/minizip/ioapi.h',
+- 'contrib/minizip/unzip.c',
+- 'contrib/minizip/unzip.h',
+- 'contrib/minizip/zip.c',
+- 'contrib/minizip/zip.h',
+- ],
+ 'conditions': [
+ ['OS=="android"', {
+ 'toolsets': ['target', 'host'],
+@@ -97,6 +89,7 @@
+ 'link_settings': {
+ 'libraries': [
+ '-lz',
++ '-lminizip',
+ ],
+ },
+ }],
+
+https://code.google.com/p/mod-spdy/issues/detail?id=71
+
+--- src/build/common.gypi
++++ src/build/common.gypi
+@@ -25,7 +25,7 @@
+ # (Chromium already has transitive dependencies on these libraries
+ # via gtk). We want to link these libraries into our binaries so
+ # we change the default behavior.
+- 'use_system_zlib': 0,
++ 'use_system_zlib%': 0,
+ 'use_system_apache_dev%': 0,
+
+ # Putting a variables dict inside another variables dict looks kind of
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_spdy.git/commitdiff/7139bb6c2e1bb7ebb4f13067f83be64d3d605f85
More information about the pld-cvs-commit
mailing list