[gentoo-commits] gentoo-x86 commit in dev-libs/xmlrpc-c/files: xmlrpc-c-1.16.04-linking-order.patch xmlrpc-c-1.16.04-compile.patch xmlrpc-c-1.16.04-abyss-disable.patch xmlrpc-c-1.16.04-cpplinking.patch

[Peter Alfredsen (loki_val)]

loki_val    08/11/29 17:18:23

  Added:                xmlrpc-c-1.16.04-linking-order.patch
                        xmlrpc-c-1.16.04-compile.patch
                        xmlrpc-c-1.16.04-abyss-disable.patch
                        xmlrpc-c-1.16.04-cpplinking.patch
  Log:
  Bump, bug 246083. Also solves bug 235989 (!!).
  (Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64)

Revision  Changes    Path
1.1                  dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-linking-order.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-linking-order.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-linking-order.patch?rev=1.1&content-type=text/plain

Index: xmlrpc-c-1.16.04-linking-order.patch
===================================================================
diff -NrU5 xmlrpc-c-1.16.04.orig/common.mk xmlrpc-c-1.16.04/common.mk
--- xmlrpc-c-1.16.04.orig/common.mk	2008-11-29 17:31:12.000000000 +0100
+++ xmlrpc-c-1.16.04/common.mk	2008-11-29 17:35:25.000000000 +0100
@@ -134,14 +134,14 @@
   TARGET_SHARED_LE_LIBS =
 endif
 
 #------ the actual rules ----------------------------------------------------
 $(TARGET_SHARED_LIBRARIES) dummyshlib:
-	$(CCLD) $(LDFLAGS_SHLIB) $(LIBDEP) -o $@ $(LIBOBJECTS) $(LADD)
+	$(CCLD) $(LADD) $(LDFLAGS_SHLIB) $(LIBOBJECTS)  $(LIBDEP) -o $@  
 
 $(TARGET_SHARED_LIBS_PP) dummyshlibpp:
-	$(CXXLD) $(LDFLAGS_SHLIB) $(LIBDEP) -o $@ $(LIBOBJECTS) $(LADD)
+	$(CXXLD) $(LADD) $(LDFLAGS_SHLIB) $(LIBOBJECTS)  $(LIBDEP) -o $@  
 #----------------------------------------------------------------------------
 
 LIBXMLRPC_UTIL_DIR = $(BLDDIR)/lib/libutil
 
 ifneq ($(OMIT_LIBXMLRPC_UTIL_RULE),Y)
diff -NrU5 xmlrpc-c-1.16.04.orig/dylib-common.make xmlrpc-c-1.16.04/dylib-common.make
--- xmlrpc-c-1.16.04.orig/dylib-common.make	2008-11-29 17:31:12.000000000 +0100
+++ xmlrpc-c-1.16.04/dylib-common.make	2008-11-29 17:35:25.000000000 +0100
@@ -3,13 +3,13 @@
 # See unix-common.make for an explanation of this file.  This file is
 # analogous to unix-common.make, but is for an Irix system.
 
 SONAME = $(@:%.$(MIN)=%)
 
-SHLIB_CMD = $(CCLD) $(LDFLAGS_SHLIB) -o $@ $^ $(LADD)
+SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ 
 
-SHLIBPP_CMD = $(CXXLD) $(LDFLAGS_SHLIB) -o $@ $^ $(LADD)
+SHLIBPP_CMD = $(CXXLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ 
 
 SHLIB_LE_TARGETS = $(call shliblefn, $(SHARED_LIBS_TO_BUILD))
 
 $(SHLIB_LE_TARGETS):%.$(SHLIB_SUFFIX):%.$(MAJ).$(MIN).$(SHLIB_SUFFIX)
 	rm -f $@
diff -NrU5 xmlrpc-c-1.16.04.orig/irix-common.make xmlrpc-c-1.16.04/irix-common.make
--- xmlrpc-c-1.16.04.orig/irix-common.make	2008-11-29 17:31:12.000000000 +0100
+++ xmlrpc-c-1.16.04/irix-common.make	2008-11-29 17:35:25.000000000 +0100
@@ -3,11 +3,11 @@
 # See unix-common.make for an explanation of this file.  This file is
 # analogous to unix-common.make, but is for an Irix system.
 
 SONAME = $(@:%.$(MAJ):%)
 
-SHLIB_CMD = $(CCLD) $(LDFLAGS_SHLIB) -o $@ $^ $(LADD)
+SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ 
 
 SHLIB_LE_TARGETS = $(call shliblefn, $(SHARED_LIBS_TO_BUILD))
 
 $(SHLIB_LE_TARGETS):%:%.$(MAJ)
 	rm -f $@
diff -NrU5 xmlrpc-c-1.16.04.orig/unix-common.make xmlrpc-c-1.16.04/unix-common.make
--- xmlrpc-c-1.16.04.orig/unix-common.make	2008-11-29 17:31:12.000000000 +0100
+++ xmlrpc-c-1.16.04/unix-common.make	2008-11-29 17:35:25.000000000 +0100
@@ -49,11 +49,11 @@
 # SONAME is the name of the library file being built, with the minor
 #   version number cut off.  E.g. if we're building libfoo.so.1.2, SONAME
 #   is libfoo.so.1 .
 SONAME = $(@:%.$(MIN)=%)
 
-SHLIB_CMD = $(CCLD) $(LDFLAGS_SHLIB) -o $@ $^ $(LADD)
+SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ 
 
 SHLIB_LE_TARGETS = $(call shliblefn, $(SHARED_LIBS_TO_BUILD))
 
 $(SHLIB_LE_TARGETS):%:%.$(MAJ).$(MIN)
 	rm -f $@



1.1                  dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-compile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-compile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-compile.patch?rev=1.1&content-type=text/plain

Index: xmlrpc-c-1.16.04-compile.patch
===================================================================
diff -NrU5 xmlrpc-c-1.16.04.orig/src/cpp/server_cgi.cpp xmlrpc-c-1.16.04/src/cpp/server_cgi.cpp
--- xmlrpc-c-1.16.04.orig/src/cpp/server_cgi.cpp	2008-11-29 17:31:12.000000000 +0100
+++ xmlrpc-c-1.16.04/src/cpp/server_cgi.cpp	2008-11-29 17:32:20.000000000 +0100
@@ -12,10 +12,11 @@
    Contributed to the public domain by its author.
 =============================================================================*/
 
 #include <memory>
 #include <stdio.h>
+#include <cstdlib>
 
 #include "xmlrpc-c/girerr.hpp"
 using girerr::throwf;
 #include "xmlrpc-c/server_cgi.hpp"
 
@@ -34,11 +35,11 @@
     unsigned int contentLength;
     bool contentLengthPresent;
     bool authCookiePresent;
     string authCookie;
 
-    httpInfo::httpInfo() {
+    httpInfo() {
 
         const char * const requestMethodC = getenv("REQUEST_METHOD");
         const char * const contentTypeC   = getenv("CONTENT_TYPE");
         const char * const contentLengthC = getenv("CONTENT_LENGTH");
         const char * const authCookieC    = getenv("HTTP_COOKIE_AUTH");



1.1                  dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-abyss-disable.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-abyss-disable.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-abyss-disable.patch?rev=1.1&content-type=text/plain

Index: xmlrpc-c-1.16.04-abyss-disable.patch
===================================================================
diff -NrU5 xmlrpc-c-1.16.04.orig/src/cpp/Makefile xmlrpc-c-1.16.04/src/cpp/Makefile
--- xmlrpc-c-1.16.04.orig/src/cpp/Makefile	2008-11-29 14:34:40.000000000 +0100
+++ xmlrpc-c-1.16.04/src/cpp/Makefile	2008-11-29 14:36:19.000000000 +0100
@@ -15,15 +15,18 @@
 
 TARGET_LIB_NAMES_PP = \
   libxmlrpc_cpp \
   lib$(LIBXMLRPCPP_NAME) \
   libxmlrpc_server++ \
-  libxmlrpc_server_abyss++ \
   libxmlrpc_server_cgi++ \
   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)



1.1                  dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-cpplinking.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-cpplinking.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-cpplinking.patch?rev=1.1&content-type=text/plain

Index: xmlrpc-c-1.16.04-cpplinking.patch
===================================================================
diff -NrU5 xmlrpc-c-1.16.04.orig/common.mk xmlrpc-c-1.16.04/common.mk
--- xmlrpc-c-1.16.04.orig/common.mk	2008-11-29 17:37:48.000000000 +0100
+++ xmlrpc-c-1.16.04/common.mk	2008-11-29 17:38:06.000000000 +0100
@@ -265,11 +265,11 @@
 
 $(TARGET_MODS:%=%.osh):%.osh:%.c
 	$(CC) -c -o $@ $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $<
 
 $(TARGET_MODS_PP:%=%.o):%.o:%.cpp
-	$(CXX) -c -o $@ $(INCLUDES) $(CXXFLAGS) $<
+	$(CXX) -c -o $@ $(INCLUDES) $(CFLAGS_SHLIB) $(CXXFLAGS) $<
 
 $(TARGET_MODS_PP:%=%.osh): CXXFLAGS_COMMON += $(CFLAGS_SHLIB)
 
 $(TARGET_MODS_PP:%=%.osh):%.osh:%.cpp
 	$(CXX) -c -o $@ $(INCLUDES) $(CXXFLAGS) $<