Ubuntu

Merge lp:~jtaylor/ubuntu/oneiric/slurm/fix-832924 into lp:ubuntu/oneiric/slurm

Proposed by Julian Taylor on 2011-09-06
Status: Merged
Merged at revision: 7
Proposed branch: lp:~jtaylor/ubuntu/oneiric/slurm/fix-832924
Merge into: lp:ubuntu/oneiric/slurm
Diff against target: 98 lines (+42/-7) 5 files modified
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/slurm/fix-832924
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2011-09-08
Ubuntu branches 2011-09-06 Pending
Review via email: mp+74307@code.launchpad.net

Description of the Change

fixes ftbs.
it adds dh-autoreconf and patches configure.in to use LIBS instead of LDFLAGS to make as-needed happy.

forwarding not necessary as upstream changed to a different build system, it can be synced next cycle.

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Thanks for your patch and your work there!

As told on the bug, all look perfect, sponsoring, thanks again :)

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2010-07-18 19:05:29 +0000
3+++ debian/changelog 2011-09-06 20:46:46 +0000
4@@ -1,3 +1,11 @@
5+slurm (0.3.3-2ubuntu1) oneiric; urgency=low
6+
7+ * use dh_autoreconf
8+ * debian/patches/0004-fix-as-needed-build.patch: (LP: #832924)
9+ - fix build with ld --as-needed by using LIBS instead of LDFLAGS for links
10+
11+ -- Julian Taylor <jtaylor.debian@googlemail.com> Sat, 03 Sep 2011 15:15:51 +0200
12+
13 slurm (0.3.3-2) unstable; urgency=low
14
15 * New maintainer (Closes: #482401)
16
17=== modified file 'debian/control'
18--- debian/control 2010-07-18 19:05:29 +0000
19+++ debian/control 2011-09-06 20:46:46 +0000
20@@ -1,8 +1,9 @@
21 Source: slurm
22 Section: net
23 Priority: optional
24-Maintainer: Matthias Schmitz <matthias@sigxcpu.org>
25-Build-Depends: debhelper (>= 5.0.0), libncurses5-dev
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Matthias Schmitz <matthias@sigxcpu.org>
28+Build-Depends: debhelper (>= 5.0.0), libncurses5-dev, dh-autoreconf
29 Standards-Version: 3.8.4
30 vcs-git: git://git.debian.org/users/matthias-guest/slurm.git
31 vcs-browser: http://git.debian.org/?p=users/matthias-guest/slurm.git;a=summary
32
33=== added file 'debian/patches/0004-fix-as-needed-build.patch'
34--- debian/patches/0004-fix-as-needed-build.patch 1970-01-01 00:00:00 +0000
35+++ debian/patches/0004-fix-as-needed-build.patch 2011-09-06 20:46:46 +0000
36@@ -0,0 +1,28 @@
37+=== modified file 'configure.in'
38+--- slurm.orig/configure.in 2007-10-02 18:59:35 +0000
39++++ slurm/configure.in 2011-08-28 19:23:58 +0000
40+@@ -67,14 +67,15 @@
41+ esac
42+ # add Slowlaris -R and libraries to LDFLAGS
43+ if test ${OSTYPE} = "solaris" ; then
44+- LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
45++ LDFLAGS="${LDFLAGS} ${SOLLDFLAGS}"
46++ LIBS="${LIBS} -lnsl -lsocket -lkstat"
47+ fi
48+
49+ AC_CHECK_LIB(fridge, vanilla_coke, echo "WTF?!", echo "Warning: No vanilla coke found in fridge.";echo "We highly suggest that you rectify this situation immediatly.")
50+ ncurses_support="no"
51+ curses_support="no"
52+ color_support="no"
53+-AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LDFLAGS="$LDFLAGS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib")))
54++AC_CHECK_LIB(ncurses, use_default_colors, LIBS="$LIBS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LIBS="$LIBS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LIBS="$LIBS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib")))
55+
56+ # disable color support on Solaris for now
57+ if test ${OSTYPE} = "solaris" ; then
58+@@ -95,4 +96,5 @@
59+ compiler: ${CC}
60+ compiler flags: ${CFLAGS}
61+ linker flags: ${LDFLAGS}
62++ libraries: ${LIBS}
63+ "
64+
65
66=== modified file 'debian/patches/series'
67--- debian/patches/series 2010-07-18 19:05:29 +0000
68+++ debian/patches/series 2011-09-06 20:46:46 +0000
69@@ -1,3 +1,4 @@
70 0001-config.guess.patch
71 0002-slurm.1.patch
72 0003-config.sub.patch
73+0004-fix-as-needed-build.patch
74
75=== modified file 'debian/rules'
76--- debian/rules 2007-10-02 18:59:35 +0000
77+++ debian/rules 2011-09-06 20:46:46 +0000
78@@ -13,11 +13,7 @@
79
80 config.status: configure
81 dh_testdir
82- # work around weird upstream timestamps
83- touch aclocal.m4
84- touch Makefile.in
85- touch config.h.in
86- touch configure
87+ dh_autoreconf
88 CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
89
90
91@@ -33,6 +29,7 @@
92 clean:
93 dh_testdir
94 dh_testroot
95+ dh_autoreconf_clean
96 rm -f build-stamp
97
98 [ ! -f Makefile ] || $(MAKE) distclean

Subscribers

People subscribed via source and target branches

to all changes: