diffstat for xmlrpc-c_1.16.33-3.1 xmlrpc-c_1.16.33-3.1stormos0

 debian/patches/solaris_FTBFS.patch     |   22 ++++++++++++++++++++++
 xmlrpc-c-1.16.33/debian/changelog      |    6 ++++++
 xmlrpc-c-1.16.33/debian/patches/series |    3 ++-
 xmlrpc-c-1.16.33/debian/rules          |    9 +++++++--
 4 files changed, 37 insertions(+), 3 deletions(-)

diff -u xmlrpc-c-1.16.33/debian/changelog xmlrpc-c-1.16.33/debian/changelog
--- xmlrpc-c-1.16.33/debian/changelog
+++ xmlrpc-c-1.16.33/debian/changelog
@@ -1,3 +1,9 @@
+xmlrpc-c (1.16.33-3.1stormos0) unstable; urgency=low
+
+  * Package for StormOS Flash.
+
+ -- Andrew Stormont (astormont) <andyjstormont@googlemail.com>  Mon, 26 Sep 2011 23:27:39 +0100
+
 xmlrpc-c (1.16.33-3.1) unstable; urgency=low
 
   * Non-maintainer upload with OK from Maintainer.
diff -u xmlrpc-c-1.16.33/debian/rules xmlrpc-c-1.16.33/debian/rules
--- xmlrpc-c-1.16.33/debian/rules
+++ xmlrpc-c-1.16.33/debian/rules
@@ -27,6 +27,11 @@
   CFLAGS += -O2
 endif
 
+DEB_BUILD_ARCH_OS	?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+ifeq ($(DEB_BUILD_ARCH_OS),solaris)
+  CFLAGS += -std=c99 -D__EXTENSIONS__
+endif
+
 # include the patch/unpatch rules from quilt
 include /usr/share/quilt/quilt.make
 
@@ -51,8 +56,8 @@
 build-arch: build-arch-stamp
 build-arch-stamp: config.status
 	dh_testdir
-	$(MAKE) CADD=-fPIC
-	( cd tools && $(MAKE) CADD=-fPIC )
+	$(MAKE) CADD="-fPIC $(CFLAGS)"
+	( cd tools && $(MAKE) CADD="-fPIC $(CFLAGS)" )
 	touch build-arch-stamp
 
 build-indep: build-indep-stamp
diff -u xmlrpc-c-1.16.33/debian/patches/series xmlrpc-c-1.16.33/debian/patches/series
--- xmlrpc-c-1.16.33/debian/patches/series
+++ xmlrpc-c-1.16.33/debian/patches/series
@@ -1,3 +1,4 @@
-636542_FTBFS_curl.patch
 565785_kfreebsd_ftbfs.patch
 614937_FTBFS_hurd-i386.patch
+636542_FTBFS_curl.patch
+solaris_FTBFS.patch
only in patch2:
unchanged:
--- xmlrpc-c-1.16.33.orig/debian/patches/solaris_FTBFS.patch
+++ xmlrpc-c-1.16.33/debian/patches/solaris_FTBFS.patch
@@ -0,0 +1,22 @@
+--- ./config.mk.in.bak	2011-09-26 23:34:05.471784935 +0100
++++ ./config.mk.in	2011-09-26 23:37:58.810892539 +0100
+@@ -194,16 +194,15 @@
+ endif
+ 
+ ifeq ($(patsubst solaris%,solaris,$(HOST_OS)),solaris)
++  # Assume linker is GNU Compiler (gcc)
+   SHARED_LIB_TYPE = unix
+   MUST_BUILD_SHLIB = Y
+   MUST_BUILD_SHLIBLE = Y
+   SHLIB_SUFFIX = so
+   shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
+   shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+-  # Solaris compiler (Sun C 5.5) can't take multiple ld options as
+-  # -Wl,-a,-b .  Ld sees -a,-b in that case.
+-  LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
+-  CFLAGS_SHLIB = -Kpic
++  LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
++  CFLAGS_SHLIB = -fPIC
+ endif
+ 
+ ifeq ($(patsubst aix%,aix,$(HOST_OS)),aix)