[med-svn] r9364 - in trunk/packages/libhmsbeagle/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-01-21 16:46:46 +0000 (Sat, 21 Jan 2012)
New Revision: 9364

Added:
   trunk/packages/libhmsbeagle/trunk/debian/patches/
   trunk/packages/libhmsbeagle/trunk/debian/patches/do_not_build_unused_plugin.patch
   trunk/packages/libhmsbeagle/trunk/debian/patches/enable_static.patch
   trunk/packages/libhmsbeagle/trunk/debian/patches/series
Modified:
   trunk/packages/libhmsbeagle/trunk/debian/changelog
   trunk/packages/libhmsbeagle/trunk/debian/libhmsbeagle-dev.install
Log:
Install static libraries in -dev package; failed to solve #656755 but leave the patch I tried for further reference


Modified: trunk/packages/libhmsbeagle/trunk/debian/changelog
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/changelog	2012-01-21 14:36:11 UTC (rev 9363)
+++ trunk/packages/libhmsbeagle/trunk/debian/changelog	2012-01-21 16:46:46 UTC (rev 9364)
@@ -1,3 +1,11 @@
+libhmsbeagle (1.0-3) unstable; urgency=low
+
+  * debian/patches/enable_static.patch: Enable building static
+    libraries that should be contained in -dev package
+  * debian/libhmsbeagle-dev.install: Install static libraries
+
+ -- Andreas Tille <tille at debian.org>  Sat, 21 Jan 2012 17:27:53 +0100
+
 libhmsbeagle (1.0-2) unstable; urgency=low
 
   * debian/rules: Prevent compiler options -march=native and -msse2

Modified: trunk/packages/libhmsbeagle/trunk/debian/libhmsbeagle-dev.install
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/libhmsbeagle-dev.install	2012-01-21 14:36:11 UTC (rev 9363)
+++ trunk/packages/libhmsbeagle/trunk/debian/libhmsbeagle-dev.install	2012-01-21 16:46:46 UTC (rev 9364)
@@ -1,3 +1,4 @@
 usr/include/*
 usr/lib/pkgconfig/*
 usr/lib/lib*.so
+usr/lib/lib*.a

Added: trunk/packages/libhmsbeagle/trunk/debian/patches/do_not_build_unused_plugin.patch
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/patches/do_not_build_unused_plugin.patch	                        (rev 0)
+++ trunk/packages/libhmsbeagle/trunk/debian/patches/do_not_build_unused_plugin.patch	2012-01-21 16:46:46 UTC (rev 9364)
@@ -0,0 +1,31 @@
+Author: Andreas Tille <tille at debian.org>
+Bug-Closed: http://bugs.debian.org/656755
+Date: Sat, 21 Jan 2012 17:27:53 +0100
+Description: According to the bug reporter the plugin causes
+ trouble on all architectures but amd64.  Because this plugin
+ is finally not used at all the building will be simply
+ suppressed
+
+That's too simple and does not work - it results in
+
+../../libhmsbeagle/.libs/libhmsbeagle.so: undefined reference to `beagle::plugin::PluginManager::instance()'
+../../libhmsbeagle/.libs/libhmsbeagle.so: undefined reference to `beagle::plugin::PluginManager::findPlugin(char const*)'
+
+
+--- libhmsbeagle-1.0.orig/libhmsbeagle/Makefile.am
++++ libhmsbeagle-1.0/libhmsbeagle/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS=GPU CPU plugin
++SUBDIRS=GPU CPU
+ if BUILDJNI
+ lib_LTLIBRARIES=libhmsbeagle.la libhmsbeagle-jni.la
+ else
+@@ -6,7 +6,7 @@
+ endif
+ 
+ libhmsbeagle_la_SOURCES=beagle.cpp BeagleImpl.h
+-libhmsbeagle_la_LIBADD = plugin/libplugin.la
++# libhmsbeagle_la_LIBADD = plugin/libplugin.la
+ libhmsbeagle_la_CXXFLAGS = $(AM_CXXFLAGS)
+ libhmsbeagle_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION)
+ 

Added: trunk/packages/libhmsbeagle/trunk/debian/patches/enable_static.patch
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/patches/enable_static.patch	                        (rev 0)
+++ trunk/packages/libhmsbeagle/trunk/debian/patches/enable_static.patch	2012-01-21 16:46:46 UTC (rev 9364)
@@ -0,0 +1,17 @@
+Author: Andreas Tille <tille at debian.org>
+Date: Sat, 21 Jan 2012 17:27:53 +0100
+Description: Enable building static libraries for the -dev package
+
+--- libhmsbeagle-1.0.orig/configure.ac
++++ libhmsbeagle-1.0/configure.ac
+@@ -59,8 +59,8 @@
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_DISABLE_STATIC
+-AM_DISABLE_STATIC
++#AC_DISABLE_STATIC
++#AM_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ AM_PROG_LIBTOOL
+ 

Added: trunk/packages/libhmsbeagle/trunk/debian/patches/series
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/libhmsbeagle/trunk/debian/patches/series	2012-01-21 16:46:46 UTC (rev 9364)
@@ -0,0 +1 @@
+enable_static.patch