The following commit has been merged in the master branch:
commit 6d499905347cb6186442dfbe77924c08ab6ab44a
Author: Andreas Tille <[email protected]>
Date: Thu Aug 9 16:04:13 2012 +0200
Import patches prepared by Felix Geyer <[email protected]> to cope with the
--as-needed issue when linking against database clients
diff --git a/debian/changelog b/debian/changelog
index 305d3a9..b24310d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+emboss (6.4.0-3) UNRELEASED; urgency=low
+
+ * Import patches prepared by Felix Geyer <[email protected]> to cope
+ with the --as-needed issue when linking against database clients
+ (thanks to Felix)
+ Closes: #650237
+
+ -- Andreas Tille <[email protected]> Thu, 09 Aug 2012 16:01:07 +0200
+
emboss (6.4.0-2) unstable; urgency=low
* Separate architecture-dependant and independant targets in debian/rules.
diff --git a/debian/patches/fix-mysql-macro.patch
b/debian/patches/fix-mysql-macro.patch
new file mode 100644
index 0000000..1e33c01
--- /dev/null
+++ b/debian/patches/fix-mysql-macro.patch
@@ -0,0 +1,29 @@
+Description: Enable linking mysqlclient with linker set for --as-needed
+Author: Felix Geyer <[email protected]>
+Date: Sun, 29 Jul 2012 22:07:33 +0200
+Bugs-Debian: http://bugs.debian.org/650237
+
+--- emboss-6.4.0.orig/m4/mysql.m4
++++ emboss-6.4.0/m4/mysql.m4
+@@ -100,10 +100,10 @@
+ dnl not be installed
+
+ EMBCPPFLAGS=$CPPFLAGS
+- EMBLDFLAGS=$LDFLAGS
++ EMBLIBS=$LIBS
+
+ CPPFLAGS="$MYSQL_CPPFLAGS $EMBCPPFLAGS"
+- LDFLAGS="$MYSQL_LDFLAGS $EMBLDFLAGS"
++ LIBS="$MYSQL_LDFLAGS $EMBLIBS"
+
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+ #include "mysql.h"]],
+@@ -112,7 +112,7 @@
+ [havemysql=no])
+
+ CPPFLAGS=$EMBCPPFLAGS
+- LDFLAGS=$EMBLDFLAGS
++ LIBS=$EMBLIBS
+
+ if test "$havemysql" = yes; then
+ AC_DEFINE([HAVE_MYSQL], [1],
diff --git a/debian/patches/fix-postgresql-macro.patch
b/debian/patches/fix-postgresql-macro.patch
new file mode 100644
index 0000000..64af046
--- /dev/null
+++ b/debian/patches/fix-postgresql-macro.patch
@@ -0,0 +1,29 @@
+Description: Enable linking pgsqlclient with linker set for --as-needed
+Author: Felix Geyer <[email protected]>
+Date: Sun, 29 Jul 2012 22:07:33 +0200
+Bugs-Debian: http://bugs.debian.org/650237
+
+--- emboss-6.4.0.orig/m4/postgresql.m4
++++ emboss-6.4.0/m4/postgresql.m4
+@@ -96,10 +96,10 @@
+ dnl not be installed
+
+ EMBCPPFLAGS=$CPPFLAGS
+- EMBLDFLAGS=$LDFLAGS
++ EMBLIBS=$LIBS
+
+ CPPFLAGS="$POSTGRESSQL_CPPFLAGS $EMBCPPFLAGS"
+- LDFLAGS="$POSTGRESQL_LDFLAGS $EMBLDFLAGS"
++ LIBS="$POSTGRESQL_LDFLAGS $EMBLIBS"
+
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+ #include "libpq-fe.h"]],
+@@ -108,7 +108,7 @@
+ [havepostgresql=no])
+
+ CPPFLAGS=$EMBCPPFLAGS
+- LDFLAGS=$EMBLDFLAGS
++ LIBS=$EMBLIBS
+
+ if test "$havepostgresql" = yes; then
+ AC_DEFINE([HAVE_POSTGRESQL], [1],
diff --git a/debian/patches/series b/debian/patches/series
index 06a3ea4..402af6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
official-upstream-patch.patch
using-pager-in-tfm.patch
tfm-html.patch
+fix-postgresql-macro.patch
+fix-mysql-macro.patch
--
The European Molecular Biology Open Software Suite.
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
