summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-06-15 16:00:20 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-06-15 16:00:20 +0000
commit7b1db9066e4c470e52b20447dbc1d2c90a4675aa (patch)
treecdd39c3450e4b62b847f80db8d5dc84f59b9e4eb /dev-libs/xmlrpc-c
parentold (diff)
downloadgentoo-2-7b1db9066e4c470e52b20447dbc1d2c90a4675aa.tar.gz
gentoo-2-7b1db9066e4c470e52b20447dbc1d2c90a4675aa.tar.bz2
gentoo-2-7b1db9066e4c470e52b20447dbc1d2c90a4675aa.zip
Really, *don't* build abyss. Bug 227187.
(Portage version: 2.1.5.5)
Diffstat (limited to 'dev-libs/xmlrpc-c')
-rw-r--r--dev-libs/xmlrpc-c/ChangeLog6
-rw-r--r--dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-abyss-disable.patch22
-rw-r--r--dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild14
3 files changed, 36 insertions, 6 deletions
diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index 5c082e4369a5..1699dd140cad 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/xmlrpc-c
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.58 2008/06/08 22:35:23 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.59 2008/06/15 16:00:19 loki_val Exp $
+
+ 15 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+ +files/xmlrpc-c-1.14.07-abyss-disable.patch, xmlrpc-c-1.14.07.ebuild:
+ Really, *don't* build abyss. Bug 227187.
08 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
-xmlrpc-c-1.06.03.ebuild:
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-abyss-disable.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-abyss-disable.patch
new file mode 100644
index 000000000000..c7a5bafce04d
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-abyss-disable.patch
@@ -0,0 +1,22 @@
+diff -NrU5 xmlrpc-c-1.14.07.orig/src/cpp/Makefile xmlrpc-c-1.14.07/src/cpp/Makefile
+--- xmlrpc-c-1.14.07.orig/src/cpp/Makefile 2008-06-15 16:12:38.000000000 +0200
++++ xmlrpc-c-1.14.07/src/cpp/Makefile 2008-06-15 16:15:54.000000000 +0200
+@@ -15,14 +15,17 @@
+
+ TARGET_LIB_NAMES_PP := \
+ libxmlrpc_cpp \
+ libxmlrpc++ \
+ libxmlrpc_server++ \
+- libxmlrpc_server_abyss++ \
+ libxmlrpc_server_pstream++ \
+ libxmlrpc_packetsocket \
+
++ifeq ($(ENABLE_ABYSS_SERVER),yes)
++ TARGET_LIB_NAMES_PP += libxmlrpc_server_abyss++
++endif
++
+ ifeq ($(MUST_BUILD_CLIENT),yes)
+ TARGET_LIB_NAMES_PP += libxmlrpc_client++
+ endif
+
+ STATIC_LIBRARIES_TO_INSTALL = $(TARGET_STATIC_LIBRARIES)
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
index c45b91a311f6..b77c3378e6dc 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild,v 1.1 2008/06/04 12:19:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild,v 1.2 2008/06/15 16:00:19 loki_val Exp $
EAPI=1
-inherit eutils autotools
+inherit eutils autotools base
DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
SRC_URI="mirror://gentoo/${PN}/${P}.tar.bz2"
@@ -25,13 +25,17 @@ pkg_setup() {
fi
}
+PATCHES=( "${FILESDIR}/${P}-abyss-disable.patch" )
+
src_unpack() {
- unpack ${A}
+ base_src_unpack
cd "${S}"
# Respect the user's CFLAGS/CXXFLAGS.
- sed -i -e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" Makefile.common
- sed -i -e "/CXXFLAGS_COMMON/s:-g$:${CXXFLAGS}:" Makefile.common
+ sed -i \
+ -e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" \
+ -e "/CXXFLAGS_COMMON/s:-g$:${CXXFLAGS}:" \
+ "${S}"/Makefile.common
eautoreconf
}