rpms/xmlrpc-c/devel make-cmake-transition.patch,1.2,1.3
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Mon Mar 17 20:00:03 UTC 2008
Author: ensc
Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14852
Modified Files:
make-cmake-transition.patch
Log Message:
- fixed cmake quoting so that pkgconfig files get correct version number
- fixed handling of 'server-util' and '--cflags' within xmlrpc-c-config
make-cmake-transition.patch:
Index: make-cmake-transition.patch
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/make-cmake-transition.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- make-cmake-transition.patch 16 Mar 2008 12:53:04 -0000 1.2
+++ make-cmake-transition.patch 17 Mar 2008 19:59:56 -0000 1.3
@@ -1,4 +1,4 @@
-From 47cfdb0901f76d8b571a3c8fb6fa251e779c587c Mon Sep 17 00:00:00 2001
+From 91b0e8786c1231172fc43848cab83773ad603c59 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Mon, 25 Feb 2008 17:19:20 +0100
Subject: [PATCH] make -> cmake transition
@@ -56,9 +56,9 @@
tools/xmlrpc_transport/config.h | 1 +
transport_config.h.cmake | 16 ++
version.h.cmake | 5 +
- xmlrpc-c-config | 74 ++++++++
+ xmlrpc-c-config | 77 ++++++++
xmlrpc_config.h.cmake | 87 +++++++++
- 54 files changed, 1288 insertions(+), 0 deletions(-)
+ 54 files changed, 1291 insertions(+), 0 deletions(-)
create mode 100644 CMakeLists.txt
create mode 100644 cmake/try-attr.cc
create mode 100644 cmake/va-list-is-array.c
@@ -116,7 +116,7 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
-index 0000000..b23f79e
+index 0000000..aa21f44
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,261 @@
@@ -131,7 +131,7 @@
+set(XMLRPC_C_VERSION_POINT "8" CACHE STRING "Version (point) of xmlrpc-c")
+
+set(XMLRPC_C_VERSION
-+ "$XMLRPC_C_VERSION_MAJOR.$XMLRPC_C_VERSION_MINOR.$XMLRPC_C_VERSION_POINT"
++ "${XMLRPC_C_VERSION_MAJOR}.${XMLRPC_C_VERSION_MINOR}.${XMLRPC_C_VERSION_POINT}"
+ CACHE STRING "Version of xmlrpc-c")
+
+set(XMLRPC_C_LIBVERSION "3.13")
@@ -1555,10 +1555,10 @@
+#define XMLRPC_VERSION_POINT @XMLRPC_C_VERSION_POINT_NUM@
diff --git a/xmlrpc-c-config b/xmlrpc-c-config
new file mode 100755
-index 0000000..971800f
+index 0000000..8915017
--- /dev/null
+++ b/xmlrpc-c-config
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,77 @@
+#! /bin/sh
+
+comp=
@@ -1573,7 +1573,7 @@
+while test $# -gt 0; do
+ case $1 in
+ (c++) comp="$comp xmlrpc_cpp";;
-+ (server-util) comp="$comp xmlrpc_server_util";;
++ (server-util) comp="$comp xmlrpc_server";;
+ (cgi-server) comp="$comp xmlrpc_server_cgi";;
+ (c++2) need_cxx=1;;
+ (abyss-server) need_abyss=1;;
@@ -1625,6 +1625,9 @@
+ (--ldadd)
+ set -- --libs-only-l
+ ;;
++ (--cflags)
++ set -- "$1"
++ ;;
+ (*)
+ dummy_comp=
+ ;;
More information about the fedora-extras-commits
mailing list