[libmatheval] 07/08: drop 0001-link-with-fl_pic.patch in favor of a override in debian/rules

[Julian Taylor]

This is an automated email from the git hooks/post-receive script.

jtaylor-guest pushed a commit to branch master
in repository libmatheval.

commit 010512c62977d40cc49e5c1bafdc25a9c88b1da8
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue May 6 20:21:11 2014 +0200

    drop 0001-link-with-fl_pic.patch in favor of a override in debian/rules
---
 debian/changelog                           |  1 +
 debian/patches/0001-link-with-fl_pic.patch | 35 ------------------------------
 debian/patches/series                      |  1 -
 debian/rules                               |  4 ++++
 4 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbb7efd..f15a137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libmatheval (1.1.11+dfsg-1) unstable; urgency=medium
 
   * New upstream release
+    - drop 0001-link-with-fl_pic.patch in favor of a override in debian/rules
   * mark flex generated symbols optional in symbol file (Closes: #746149)
   * bump standard to 3.9.5, no changes required
   * update debian/watch to repackage tarball
diff --git a/debian/patches/0001-link-with-fl_pic.patch b/debian/patches/0001-link-with-fl_pic.patch
deleted file mode 100644
index e513658..0000000
--- a/debian/patches/0001-link-with-fl_pic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Steinar H. Gunderson <sesse at debian.org>
-Date: Fri,  8 Sep 2006 01:13:41 +0200
-Bug-Debian: http://bugs.debian.org/384957
-Subject: Link against -lfl_pic instead of -lfl
-
-fixes FTBFS on several platforms (among them amd64)
-with gcc 4.1. (Closes: #384957)
-
----
- lib/Makefile.am |    2 +-
- lib/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -29,7 +29,7 @@ libmatheval_la_SOURCES = parser.y scanne
- g77_interface.c node.c symbol_table.c xmalloc.c xmath.c
- 
- libmatheval_la_LDFLAGS = -version-info 1:0:0
--libmatheval_la_LIBADD = -lfl -lm
-+libmatheval_la_LIBADD = -lfl_pic -lm
- 
- include_HEADERS = matheval.h
- noinst_HEADERS = common.h error.h node.h symbol_table.h xmalloc.h	\
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -286,7 +286,7 @@ libmatheval_la_SOURCES = parser.y scanne
- g77_interface.c node.c symbol_table.c xmalloc.c xmath.c
- 
- libmatheval_la_LDFLAGS = -version-info 1:0:0
--libmatheval_la_LIBADD = -lfl -lm
-+libmatheval_la_LIBADD = -lfl_pic -lm
- include_HEADERS = matheval.h
- noinst_HEADERS = common.h error.h node.h symbol_table.h xmalloc.h	\
- xmath.h
diff --git a/debian/patches/series b/debian/patches/series
index c2bf68b..ab6d7b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-link-with-fl_pic.patch
 002-skip-docs.patch
diff --git a/debian/rules b/debian/rules
index 121b5b4..3f46d05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,9 @@ export DH_VERBOSE=1
 %:
 	dh $@ --with autoreconf --as-needed
 
+override_dh_auto_configure:
+	# #384957
+	dh_auto_configure -- LEXLIB="-lfl_pic"
+
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libmatheval.git