Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 471592 | Differences between
and this patch

Collapse All | Expand All

(-)mod_spdy.orig/mod_spdy-0.9.3.3.ebuild (-3 / +39 lines)
Line 0 Link Here
1
source: https://code.google.com/p/mod-spdy/issues/detail?id=64
2
3
diff -Naur mod_spdy-0.9.3.3.orig/src/build_modssl_with_npn.sh mod_spdy-0.9.3.3/src/build_modssl_with_npn.sh
4
--- mod_spdy-0.9.3.3.orig/src/build_modssl_with_npn.sh	2013-05-28 01:53:11.000000000 +0200
Line 0 Link Here
1
source: https://github.com/pld-linux/apache-mod_spdy/blob/master/log-constants.patch
2
fix: third_party/chromium/src/base/logging.h:292:19: error: expected unqualified-id before numeric constant
3
4
"fix":
5
mod_spdy/mod_spdy.cc: In function 'void {anonymous}::ChildInit(apr_pool_t*, server_rec*)':
6
mod_spdy/mod_spdy.cc:253:31: error: 'LOG_INFO' was not declared in this scope
7
mod_spdy/mod_spdy.cc:253:31: note: suggested alternative:
8
In file included from third_party/chromium/src/net/spdy/spdy_protocol.h:13:0,
9
                 from third_party/chromium/src/net/spdy/spdy_framer.h:19,
10
                 from ./mod_spdy/common/http_to_spdy_converter.h:24,
11
                 from ./mod_spdy/apache/filters/http_to_spdy_filter.h:24,
12
                 from mod_spdy/mod_spdy.cc:40:
13
third_party/chromium/src/base/logging.h:290:19: note:   'logging::LOG_INFO'
14
mod_spdy/mod_spdy.cc:253:45: error: template argument 1 is invalid
15
mod_spdy/mod_spdy.cc:253:108: error: invalid type in declaration before ';' token
16
--- src/third_party/chromium/src/base/logging.h	2013-03-04 11:44:06.000000000 +0200
Line 0 Link Here
1
source: https://github.com/pld-linux/apache-mod_spdy/blob/master/gyp.patch
2
fix: Exception: Target third_party/apache/aprutil/aprutil.gyp:aprutil#target has an invalid target type 'settings'.  Must be one of executable/loadable_module/static_library/shared_library/none.
3
4
--- src/third_party/apache/apr/apr.gyp	2013-03-04 11:24:34.000000000 +0200
Lines 17-24 Link Here
17
	KEYWORDS="~amd64 ~x86"
17
	KEYWORDS="~amd64 ~x86"
18
fi
18
fi
19
19
20
DESCRIPTION="Apache module for rewriting web pages to reduce latency and bandwidth"
20
DESCRIPTION="Apache SPDY module"
21
HOMEPAGE="http://code.google.com/p/modpagespeed"
21
HOMEPAGE="https://code.google.com/p/mod-spdy"
22
22
23
LICENSE="Apache-2.0"
23
LICENSE="Apache-2.0"
24
SLOT="0"
24
SLOT="0"
Lines 30-36 Link Here
30
	DEPEND+=" net-misc/rsync"
30
	DEPEND+=" net-misc/rsync"
31
fi
31
fi
32
32
33
need_apache2_2
33
need_apache2_4
34
34
35
e() { echo "$@"; "$@" || die; }
35
e() { echo "$@"; "$@" || die; }
36
36
Lines 56-61 Link Here
56
src_prepare() {
56
src_prepare() {
57
	epatch "${FILESDIR}"/${PN}-0.9.3.3-execinfo.patch
57
	epatch "${FILESDIR}"/${PN}-0.9.3.3-execinfo.patch
58
58
59
	epatch "${FILESDIR}"/${PN}-0.9.3.3-2.2_to_2.4.patch
60
	epatch "${FILESDIR}"/${PN}-0.9.3.3-gyp.patch
61
	epatch "${FILESDIR}"/${PN}-0.9.3.3-compile-fix.patch
62
63
	# Make sure the system apr/apr-util and apache2 are used.
64
	find src/third_party/apache/apr{,util}/src/include/ -name '*.[ch]' -delete
65
	find src/third_party/apache/httpd/src/include/ -name '*.[ch]' -delete
66
59
	# Make sure the system zlib is used.
67
	# Make sure the system zlib is used.
60
	epatch "${FILESDIR}"/${PN}-0.9.3.3-system-zlib.patch
68
	epatch "${FILESDIR}"/${PN}-0.9.3.3-system-zlib.patch
61
	find src/third_party/zlib/ -name '*.[ch]' -delete
69
	find src/third_party/zlib/ -name '*.[ch]' -delete
Lines 66-71 Link Here
66
	tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX
74
	tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX
67
75
68
	local myconf=(
76
	local myconf=(
77
		-Dsystem_include_path_apr=/usr/include/apr-1
78
		-Dsystem_include_path_aprutil=/usr/include/apr-1
79
		-Dsystem_include_path_httpd=/usr/include/apache2
80
		-Duse_system_apache_dev=1
69
		-Duse_system_zlib=1
81
		-Duse_system_zlib=1
70
		-Duse_system_ssl=1
82
		-Duse_system_ssl=1
71
		-Dwerror=
83
		-Dwerror=

Return to bug 471592