diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-23 17:51:39 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-23 17:51:39 +0000 |
| commit | 04def206ad2eb390ad1a1ce2d24e21ba5b8785a6 (patch) | |
| tree | edceb86c0f3d41401a9322e1771ae37bfe35fc5b /www-servers | |
| parent | amend changelog to contain the bug # (diff) | |
| download | gentoo-2-04def206ad2eb390ad1a1ce2d24e21ba5b8785a6.tar.gz gentoo-2-04def206ad2eb390ad1a1ce2d24e21ba5b8785a6.tar.bz2 gentoo-2-04def206ad2eb390ad1a1ce2d24e21ba5b8785a6.zip | |
Fix build with ocamlnet built without -compat-pcre.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/ocsigenserver/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/ocsigenserver/files/pcre.patch | 39 | ||||
| -rw-r--r-- | www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild | 8 |
3 files changed, 50 insertions, 3 deletions
diff --git a/www-servers/ocsigenserver/ChangeLog b/www-servers/ocsigenserver/ChangeLog index 154e7f52e819..483faf990e15 100644 --- a/www-servers/ocsigenserver/ChangeLog +++ b/www-servers/ocsigenserver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/ocsigenserver # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.3 2013/01/13 19:57:37 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.4 2013/07/23 17:51:39 aballier Exp $ + + 23 Jul 2013; Alexis Ballier <aballier@gentoo.org> ocsigenserver-2.2.0.ebuild, + +files/pcre.patch: + Fix build with ocamlnet built without -compat-pcre. *ocsigenserver-2.2.0 (13 Jan 2013) diff --git a/www-servers/ocsigenserver/files/pcre.patch b/www-servers/ocsigenserver/files/pcre.patch new file mode 100644 index 000000000000..187b2b9c5994 --- /dev/null +++ b/www-servers/ocsigenserver/files/pcre.patch @@ -0,0 +1,39 @@ +Fix build with ocamlnet built without -compat-pcre. + +Index: ocsigenserver-2.2.0/src/extensions/Makefile +=================================================================== +--- ocsigenserver-2.2.0.orig/src/extensions/Makefile ++++ ocsigenserver-2.2.0/src/extensions/Makefile +@@ -4,6 +4,7 @@ PACKAGE := lwt.unix \ + lwt.ssl \ + lwt.react \ + netstring \ ++ netstring-pcre \ + tyxml.parser \ + + LIBS := -I ../baselib -I ../http -I ../server ${addprefix -package ,${PACKAGE}} +Index: ocsigenserver-2.2.0/configure +=================================================================== +--- ocsigenserver-2.2.0.orig/configure ++++ ocsigenserver-2.2.0/configure +@@ -414,6 +414,8 @@ check_library lwt.ssl "Missing support + + check_library netstring \ + "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html" ++check_library netstring-pcre \ ++ "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html" + check_library netsys \ + "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html" + +Index: ocsigenserver-2.2.0/Makefile.options +=================================================================== +--- ocsigenserver-2.2.0.orig/Makefile.options ++++ ocsigenserver-2.2.0/Makefile.options +@@ -34,6 +34,7 @@ BASE_PACKAGE := lwt + SERVER_PACKAGE := lwt.ssl \ + ${LWT_EXTRA_PACKAGE} \ + netstring \ ++ netstring-pcre \ + findlib \ + cryptokit \ + tyxml \ diff --git a/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild index 1488920fd5fc..b7c70e435d7b 100644 --- a/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild +++ b/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild,v 1.1 2013/01/13 19:57:37 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild,v 1.2 2013/07/23 17:51:39 aballier Exp $ EAPI=4 @@ -20,7 +20,7 @@ RESTRICT="strip installsources" DEPEND=">=dev-ml/lwt-2.3.0[react,ssl] zlib? ( >=dev-ml/camlzip-1.03-r1 ) dev-ml/cryptokit - >=dev-ml/ocamlnet-2.2.9 + >=dev-ml/ocamlnet-3.6[pcre] >=dev-ml/pcre-ocaml-6.0.1 >=dev-ml/tyxml-2.1 >=dev-lang/ocaml-3.12[ocamlopt?] @@ -33,6 +33,10 @@ pkg_setup() { enewuser ocsigenserver -1 -1 /var/www ocsigenserver } +src_prepare() { + epatch "${FILESDIR}/pcre.patch" +} + src_configure() { sh configure \ --prefix /usr \ |