On 2011-10-26 19:25 +0200, Sven Joachim wrote:

> Source: lustre
> Version: 1.8.5+dfsg-2
> Severity: important
> User: svenj...@gmx.de
> Usertags: readline-disabled
>
> When built in a clean sid chroot without libncurses5-dev installed,
> lustre loses readline support.  From my pbuilder log:
>
> ,----
> | checking whether to enable readline support... yes
> | checking for readline in -lreadline... no
> `----
>
> Adding libncurses-dev to Build-Depends should avoid this.

I see this has been done in the git repository.  BTW, you want to fix
the Vcs-Git field to point to
git://anonscm.debian.org/pkg-lustre/lustre.git.

> However, consider patching the upstream build system which erroneously
> believes that ncurses is necessary for linking with readline.

What do you think of the attached patch (untested, since I don't know
how to produce the 1.8.7-wc1+dfsg tarball)?  If you choose to apply it,
commit 5f80796 should be reverted, of course.

Cheers,
       Sven

>From 60aad29921a4ff44c4fd14c676228e9f9a707c9c Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenj...@gmx.de>
Date: Sat, 3 Dec 2011 11:40:29 +0100
Subject: [PATCH] New patch no-ncurses.patch to not link against ncurses
 (Closes: #646739)

---
 debian/patches/no-ncurses.patch |   18 ++++++++++++++++++
 debian/patches/series           |    1 +
 2 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/no-ncurses.patch

diff --git a/debian/patches/no-ncurses.patch b/debian/patches/no-ncurses.patch
new file mode 100644
index 0000000..28e313b
--- /dev/null
+++ b/debian/patches/no-ncurses.patch
@@ -0,0 +1,18 @@
+---
+ lnet/autoconf/lustre-lnet.m4 |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/lnet/autoconf/lustre-lnet.m4
++++ b/lnet/autoconf/lustre-lnet.m4
+@@ -1641,9 +1641,9 @@
+ # -------- check for readline if enabled ----
+ if test x$enable_readline = xyes ; then
+       LIBS_save="$LIBS"
+-      LIBS="-lncurses $LIBS"
++      LIBS="$LIBS"
+       AC_CHECK_LIB([readline],[readline],[
+-      LIBREADLINE="-lreadline -lncurses"
++      LIBREADLINE="-lreadline"
+       AC_DEFINE(HAVE_LIBREADLINE, 1, [readline library is available])
+       ],[
+       LIBREADLINE=""
diff --git a/debian/patches/series b/debian/patches/series
index d58ff1e..6ee5e0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ spelling_errors.patch
 cacheflush_remove_mark_rodata.patch
 615749_no_add_needed
 modified-debian-specific-stuff.patch
+no-ncurses.patch
-- 
1.7.7.3

_______________________________________________
Pkg-lustre-maintainers mailing list
Pkg-lustre-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-lustre-maintainers

Reply via email to