From 06fc9ce1e290e758671301c16647e92987a175a9 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko@openwrt.org>
Date: Sat, 15 Jan 2011 22:10:23 +0000
Subject: [PATCH] [packages/xmlrpc-c] disable build variants for now, as:  - we
 do not have a CONFLICTS yet, so both versions could be built and    would
 intefere  - variants are not binary-compatible so applications using this lib
 can    not depend on the meta-package (PROVIDES) exported by both  - the
 libxml2 variant isn't going to be used soon anyway

SVN-Revision: 25011
---
 libs/xmlrpc-c/.Makefile.swp | Bin 0 -> 16384 bytes
 libs/xmlrpc-c/Makefile      |  19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 libs/xmlrpc-c/.Makefile.swp

diff --git a/libs/xmlrpc-c/.Makefile.swp b/libs/xmlrpc-c/.Makefile.swp
new file mode 100644
index 0000000000000000000000000000000000000000..eb21e7197a123ee42812a9154beffa695bc6310a
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/libs/xmlrpc-c/Makefile b/libs/xmlrpc-c/Makefile
index 0c1e369b4a..e66c42511c 100644
--- a/libs/xmlrpc-c/Makefile
+++ b/libs/xmlrpc-c/Makefile
@@ -38,17 +38,25 @@ define Package/xmlrpc-c_internal
   TITLE:=XML-RPC library - (ueses internal expat variant)
   URL:=http://xmlrpc-c.sourceforge.net/
   DEPENDS:=+xmlrpc-c_common
-  PROVIDES:=xmlrpc-c
+#  PROVIDES:=xmlrpc-c
   VARIANT:=internal
 endef
 
+define Package/xmlrpc-c
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=XML-RPC library
+  URL:=http://xmlrpc-c.sourceforge.net/
+  DEPENDS:=+xmlrpc-c_internal
+endef
+
 define Package/xmlrpc-c_libxml2
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=XML-RPC library - (uses libxml2)
   URL:=http://xmlrpc-c.sourceforge.net/
-  DEPENDS:=+xmlrpc-c_common +libxml2
-  PROVIDES:=xmlrpc-c
+  DEPENDS:=+xmlrpc-c_common +libxml2 @BROKEN
+#  PROVIDES:=xmlrpc-c
   VARIANT:=libxml2
 endef
 
@@ -57,7 +65,7 @@ define Package/xmlrpc-c_client
   CATEGORY:=Libraries
   TITLE:=XML-RPC library - client
   URL:=http://xmlrpc-c.sourceforge.net/
-  DEPENDS:=xmlrpc-c +libcurl
+  DEPENDS:=+xmlrpc-c +libcurl
 endef
 
 define Package/xmlrpc-c_server
@@ -65,7 +73,7 @@ define Package/xmlrpc-c_server
   CATEGORY:=Libraries
   TITLE:=XML-RPC library - server
   URL:=http://xmlrpc-c.sourceforge.net/
-  DEPENDS:=xmlrpc-c
+  DEPENDS:=+xmlrpc-c
 endef
 
 define Package/xmlrpc-c_abyss
@@ -221,6 +229,7 @@ define Package/xmlrpc-c_common/install
 endef
 
 
+$(eval $(call BuildPackage,xmlrpc-c))
 $(eval $(call BuildPackage,xmlrpc-c_common))
 $(eval $(call BuildPackage,xmlrpc-c_libxml2))
 $(eval $(call BuildPackage,xmlrpc-c_internal))
-- 
2.30.2