diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2015-02-05 10:28:40 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2015-02-05 10:28:40 +0000 |
| commit | 6df80b7fc2b8a465ed623cf5ddf085ddeb3b1acc (patch) | |
| tree | fec1d88daf7f23b3bf9434c79700d064915be274 /app-admin | |
| parent | dev-vcs/git-cola: Version BUmp (diff) | |
| download | gentoo-2-6df80b7fc2b8a465ed623cf5ddf085ddeb3b1acc.tar.gz gentoo-2-6df80b7fc2b8a465ed623cf5ddf085ddeb3b1acc.tar.bz2 gentoo-2-6df80b7fc2b8a465ed623cf5ddf085ddeb3b1acc.zip | |
Fix linker calls (bug #538702 by Toralf Förster).
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/xstow/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/xstow/files/xstow-1.0.1-ncurses.patch | 29 | ||||
| -rw-r--r-- | app-admin/xstow/xstow-1.0.1.ebuild | 5 |
3 files changed, 36 insertions, 4 deletions
diff --git a/app-admin/xstow/ChangeLog b/app-admin/xstow/ChangeLog index 69423b246dc3..0ed2f827308b 100644 --- a/app-admin/xstow/ChangeLog +++ b/app-admin/xstow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/xstow # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.19 2015/01/26 18:20:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.20 2015/02/05 10:28:40 jer Exp $ + + 05 Feb 2015; Jeroen Roovers <jer@gentoo.org> xstow-1.0.1.ebuild, + files/xstow-1.0.1-ncurses.patch: + Fix linker calls (bug #538702 by Toralf Förster). 26 Jan 2015; Jeroen Roovers <jer@gentoo.org> xstow-1.0.1.ebuild, +files/xstow-1.0.1-ncurses.patch: diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch index a3f0becfd287..b7d29f287e7f 100644 --- a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch +++ b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch @@ -15,6 +15,15 @@ AC_CHECK_HEADER([curses.h], [ # test which libraray to use +@@ -146,7 +147,7 @@ + fi + + if test $support_curses -eq 1; then +- AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib") ++ AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib") + AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used]) + fi + @@ -154,8 +155,7 @@ [ support_curses=0 @@ -25,3 +34,23 @@ NO_STL_SSTREAM=0 NO_STL_STRSTREAM=0 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -46,7 +46,7 @@ + backtrace.h \ + backtrace.cpp + +-xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC) ++xstow_LDADD= $(LDFLAGS_DYNAMIC) + + if ENABLE_MERGE + +@@ -63,7 +63,7 @@ + backtrace.h \ + backtrace.cpp + +-merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC) ++merge_info_LDADD= $(LDFLAGS_DYNAMIC) + + endif + diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild index 5440022f77f9..4fc35014176c 100644 --- a/app-admin/xstow/xstow-1.0.1.ebuild +++ b/app-admin/xstow/xstow-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.3 2015/01/26 18:20:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.4 2015/02/05 10:28:40 jer Exp $ EAPI=5 @@ -28,8 +28,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" \ - install || die "emake install failed." + emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install dodoc AUTHORS ChangeLog NEWS README TODO # create new STOWDIR |