Merge lp:~jtaylor/ubuntu/oneiric/libosl/build-fixes into lp:ubuntu/oneiric/libosl

[Julian Taylor]

fix build by disabling the werror for the newunused but set warning (safer than trying to fix the code)
+ link the shared library against the needed boost fixing the dependencies and gpsshogi build

[lp:~jtaylor/ubuntu/oneiric/libosl/build-fixes]

9. By Julian Taylor on 2011-08-29

add patch headers

[Barry Warsaw (barry)]

Hi Julian. Thanks for fixing this. It looks good to me and it does indeed fix the build. I'll sponsor this upload for you.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-11 14:43:47 +0000
+++ debian/changelog	2011-08-29 16:39:25 +0000
@@ -1,3 +1,10 @@
+libosl (0.4.0-1ubuntu1) oneiric; urgency=low
+
+  * debian/rules: disable -Werror for -Wunused-but-set-variable
+  * debian/patches/link-boost.patch: link shared lib with boost (LP: #770752)
+
+ -- Julian Taylor <[e-mail]>  Mon, 29 Aug 2011 17:30:59 +0200
+
 libosl (0.4.0-1) unstable; urgency=low
 
   * New upstream release (OSL r4353).
 
=== modified file 'debian/control'
--- debian/control	2011-06-11 14:43:47 +0000
+++ debian/control	2011-08-29 16:39:25 +0000
@@ -1,7 +1,8 @@
 Source: libosl
 Section: libs
 Priority: optional
-Maintainer: Daigo Moriwaki <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Daigo Moriwaki <[e-mail]>
 Build-Depends: cdbs, debhelper (>= 7), libcppunit-dev (>= 1.10.2-5), libboost1.46-all-dev
 Standards-Version: 3.9.2
 Homepage: http://gps.tanaka.ecc.u-tokyo.ac.jp/gpsshogi/pukiwiki.php
 
=== added directory 'debian/patches'
=== added file 'debian/patches/link-boost.patch'
--- debian/patches/link-boost.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/link-boost.patch	2011-08-29 16:39:25 +0000
@@ -0,0 +1,21 @@
+Description: link with needed boost libs
+ the shared library uses boost and should link against it so the
+ dependencies are picked up by dh_shlibdeps and to allow linking
+ with ld --as-needed
+Author: Julian Taylor <[e-mail]>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633470
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gpsshogi/+bug/770752
+Index: libosl/release-so/Makefile
+===================================================================
+--- libosl.orig/release-so/Makefile	2011-08-29 17:30:18.174760804 +0200
++++ libosl/release-so/Makefile	2011-08-29 17:30:32.494760913 +0200
+@@ -13,7 +13,8 @@
+ 	    ln -s ../$$o $$target; \
+ 	  fi; \
+ 	done)
+-	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,libosl.so.1 -o $@ $(patsubst %,.objs/%,$(subst /,-,$^))
++	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,libosl.so.1 -o $@ $(patsubst %,.objs/%,$(subst /,-,$^)) \
++	  -lboost_thread -lboost_serialization -lboost_iostreams -lboost_filesystem -lboost_system
+ 	ln -sf $@ libosl.so.1
+ 	ln -sf $@ libosl.so
+ 
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-08-29 16:39:25 +0000
@@ -0,0 +1,1 @@
+link-boost.patch
 
=== modified file 'debian/rules'
--- debian/rules	2011-06-11 14:43:47 +0000
+++ debian/rules	2011-08-29 16:39:25 +0000
@@ -20,19 +20,22 @@
 DEB_INSTALL_DIRS_libosl-doc += usr/share/doc/libosl-doc
 DEB_INSTALL_DOCS_libosl-doc += doc/html
 
+
 pre-build::
 	cp $(CURDIR)/debian/makefile.local.$(DEB_HOST_ARCH_CPU) $(CURDIR)/makefile.local
 
 build/libosl$(so_ver)::
 	$(MAKE) -C release-so make-directories
-	$(MAKE) -C release-so PROF=-g OSL_PUBLIC_RELEASE=t OSL_HOME_FLAGS=-DOSL_HOME=\\\"/usr/share/gpsshogi-data\\\" $(DEB_MAKE_PARALLEL) libosl.so.$(so_ver).0
+# unused-but-set-variable disable until 633473 is fixed
+	$(MAKE) -C release-so WARN_UNUSED="-Wno-error=unused-but-set-variable -Wno-unused-parameter" PROF=-g OSL_PUBLIC_RELEASE=t OSL_HOME_FLAGS=-DOSL_HOME=\\\"/usr/share/gpsshogi-data\\\" $(DEB_MAKE_PARALLEL) libosl.so.$(so_ver).0
 
 binary-install/libosl$(so_ver)::
 	dh_install -p$(cdbs_curpkg) --sourcedir=release-so libosl.so.* usr/lib
 
 build/libosl-dev::
 	$(MAKE) -C release make-directories
-	$(MAKE) -C release PROF=-g OSL_PUBLIC_RELEASE=t OSL_HOME_FLAGS=-DOSL_HOME=\\\"/usr/share/gpsshogi-data\\\" $(DEB_MAKE_PARALLEL) all
+# unused-but-set-variable disable until 633473 is fixed
+	$(MAKE) -C release WARN_UNUSED="-Wno-error=unused-but-set-variable -Wno-unused-parameter" PROF=-g OSL_PUBLIC_RELEASE=t OSL_HOME_FLAGS=-DOSL_HOME=\\\"/usr/share/gpsshogi-data\\\" $(DEB_MAKE_PARALLEL) all
 
 binary-install/libosl-dev::
 	dh_install -p$(cdbs_curpkg) --sourcedir=release lib*.a usr/lib