c_cpp/xmlrpc-c
SHA256
8
0
Fork 0
forked from pool/xmlrpc-c
Code Pull Requests Activity

fix build on SLES_9

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/xmlrpc-c?expand=0&rev=56
This commit is contained in:
Pascal Bleser
2009-09-28 17:59:54 +00:00
committed by Git OBS Bridge
parent 1e26336311
commit fa41a25e2f
2 changed files with 64 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
xmlrpc-c-fix_without_as_needed.patch Normal file
View File

@@ -0,0 +1,60 @@
--- examples/cpp/Makefile.orig 2009-09-28 09:14:02.000000000 +0200
+++ examples/cpp/Makefile 2009-09-28 09:14:52.000000000 +0200
@@ -15,7 +15,7 @@
include $(BUILDDIR)/Makefile.config
CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
-LDFLAGS = $(LADD)
+LDFLAGS = $(LADD) -lcurl
# If this were a real application, working from an installed copy of
# Xmlrpc-c, XMLRPC_C_CONFIG would just be 'xmlrpc-c-config'. It would be
@@ -63,13 +63,13 @@
all: $(PROGS)
$(SERVERPROGS_ABYSS):%:%.o
- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS)
+ $(CXXLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS)
$(LEGACY_CLIENTPROGS):%:%.o
- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_LEGACY_CLIENT)
+ $(CXXLD) -o $@ $^ $(LDADD_LEGACY_CLIENT) $(LDFLAGS)
$(CLIENTPROGS):%:%.o
- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
+ $(CXXLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS)
%.o:%.cpp
$(CXX) -c $(INCLUDES) $(CXXFLAGS) $<
--- examples/Makefile.orig 2009-09-28 07:36:45.000000000 +0200
+++ examples/Makefile 2009-09-28 09:11:28.000000000 +0200
@@ -15,7 +15,7 @@
include $(BUILDDIR)/Makefile.config
CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
-LDFLAGS = $(LADD)
+LDFLAGS = $(LADD) -lcurl
# If this were a real application, working from an installed copy of
# Xmlrpc-c, XMLRPC_C_CONFIG would just be 'xmlrpc-c-config'. It would be
@@ -81,16 +81,16 @@
$(MAKE) -C $(dir $@) $(notdir $@)
$(CLIENTPROGS):%:%.o
- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
+ $(CCLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS)
$(SERVERPROGS_CGI):%.cgi:%_cgi.o
- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_CGI)
+ $(CCLD) -o $@ $^ $(LDADD_SERVER_CGI) $(LDFLAGS)
$(SERVERPROGS_ABYSS):%:%.o
- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS)
+ $(CCLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS)
gen_sample_add_xml:%:%.o
- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_BASE)
+ $(CCLD) -o $@ $^ $(LDADD_BASE) $(LDFLAGS)
%.o:%.c
$(CC) -c $(INCLUDES) $(CFLAGS) $<

9
xmlrpc-c.spec
View File

@@ -12,6 +12,7 @@ URL: http://xmlrpc-c.sourceforge.net
Source: xmlrpc-%{version}.tar.bz2
Patch0: xmlrpc-c-1.06.04-sizet.patch
Patch1: xmlrpc-c-fix_as_needed.patch
Patch2: xmlrpc-c-fix_without_as_needed.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires:gcc-c++ libcurl-devel libxml2-devel
Summary: Library implementing XML-based Remote Procedure Calls
@@ -118,12 +119,10 @@ Authors:
%prep
%setup -q
%patch0 -p1 -b .sizet
%patch1 -p0 -b .asneeded
%if 0%{?suse_version} < 1000
%__grep '^\+\+\+ ' "%{PATCH1}" | cut -f2 -d" " \
| while read f; do
%__sed -i 's|-Wl,--as-needed||g' "$f"
done
%patch2 -p0 -b .fix
%else
%patch1 -p0 -b .asneeded
%endif
%build