diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2013-04-11 06:17:30 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2013-04-11 06:17:30 +0000 |
| commit | 5951dd36bb407656def1d3a702d76fbd88590f30 (patch) | |
| tree | 2b18d421fa7ab9954cf8a5b00dcbdb3d95eca93e /app-forensics/magicrescue | |
| parent | revbump, migration -> distutils-r1 (diff) | |
| download | gentoo-2-5951dd36bb407656def1d3a702d76fbd88590f30.tar.gz gentoo-2-5951dd36bb407656def1d3a702d76fbd88590f30.tar.bz2 gentoo-2-5951dd36bb407656def1d3a702d76fbd88590f30.zip | |
Build fix for dupemap #415685
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-forensics/magicrescue')
| -rw-r--r-- | app-forensics/magicrescue/ChangeLog | 9 | ||||
| -rw-r--r-- | app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch | 50 | ||||
| -rw-r--r-- | app-forensics/magicrescue/magicrescue-1.1.9.ebuild | 5 |
3 files changed, 59 insertions, 5 deletions
diff --git a/app-forensics/magicrescue/ChangeLog b/app-forensics/magicrescue/ChangeLog index 9fe6d432d8a2..8c7f5730966d 100644 --- a/app-forensics/magicrescue/ChangeLog +++ b/app-forensics/magicrescue/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-forensics/magicrescue -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/ChangeLog,v 1.21 2012/09/08 01:43:35 radhermit Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/ChangeLog,v 1.22 2013/04/11 06:17:30 patrick Exp $ + + 11 Apr 2013; Patrick Lauer <patrick@gentoo.org> + +files/magicrescue-1.1.9-ldflags.patch, magicrescue-1.1.9.ebuild: + Build fix for dupemap #415685 08 Sep 2012; Tim Harder <radhermit@gentoo.org> metadata.xml: Remove redundant maintainer from metadata. @@ -88,4 +92,3 @@ 26 Jan 2005; Daniel Black <dragonheart@gentoo.org> +magicrescue-1.1.4.ebuild, +metadata.xml: Initial import. Suggested by Michael Zanetta <mzanetta@telsys.ch>. - diff --git a/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch b/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch new file mode 100644 index 000000000000..96818c3d58ed --- /dev/null +++ b/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch @@ -0,0 +1,50 @@ +diff -Naurd magicrescue-1.1.9/Makefile.in magicrescue-1.1.9.new//Makefile.in +--- magicrescue-1.1.9/Makefile.in 2008-06-27 00:24:06.000000000 +0400 ++++ magicrescue-1.1.9.new//Makefile.in 2012-05-13 07:57:59.000000000 +0400 +@@ -21,7 +21,7 @@ + $(CC) -o $@ $(LDFLAGS) $(MAGICRESCUE_OBJS) + + dupemap: $(DUPEMAP_OBJS) +- $(CC) -o $@ $(LDFLAGS) $(DBM_LDFLAGS) $(DUPEMAP_OBJS) ++ $(CC) -o $@ $(LDFLAGS) $(DUPEMAP_OBJS) $(DBM_LDFLAGS) + + tools/inputseek: $(INPUTSEEK_OBJS) + $(CC) -o $@ $(LDFLAGS) $(INPUTSEEK_OBJS) +diff -Naurd magicrescue-1.1.9/config.d/50dbm magicrescue-1.1.9.new//config.d/50dbm +--- magicrescue-1.1.9/config.d/50dbm 2008-06-27 00:24:05.000000000 +0400 ++++ magicrescue-1.1.9.new//config.d/50dbm 2012-05-13 07:56:16.000000000 +0400 +@@ -14,18 +14,14 @@ + flag="`echo $flag|sed 's/./-l&/'`" + echo "trying to link with flags [$flag]" >&5 + +- bak_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $flag" ++ LIBS="$flag" + if conftest_link; then + # we found it! +- LDFLAGS="$bak_LDFLAGS" + DBM_LDFLAGS="$flag" + env_vars="$env_vars DBM_LDFLAGS" + echo "#define $dbmdef" >> config.h + echo "#define HAVE_NDBM" >> config.h + return 0 +- else +- LDFLAGS="$bak_LDFLAGS" + fi + done + +diff -Naurd magicrescue-1.1.9/configure magicrescue-1.1.9.new//configure +--- magicrescue-1.1.9/configure 2008-06-27 00:24:06.000000000 +0400 ++++ magicrescue-1.1.9.new//configure 2012-05-13 07:56:16.000000000 +0400 +@@ -63,9 +63,9 @@ + } + + conftest_link() { +- echo "$CC -o conftest $LDFLAGS conftest.o" >&5 ++ echo "$CC -o conftest $LDFLAGS conftest.o $LIBS" >&5 + echo >&5 +- $CC -o conftest $LDFLAGS conftest.o >&5 2>&5 \ ++ $CC -o conftest $LDFLAGS conftest.o $LIBS >&5 2>&5 \ + && [ -x conftest ] && ./conftest 2>&5 + } + diff --git a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild b/app-forensics/magicrescue/magicrescue-1.1.9.ebuild index d0e04ffddf03..0bfe02be09fd 100644 --- a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild +++ b/app-forensics/magicrescue/magicrescue-1.1.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/magicrescue-1.1.9.ebuild,v 1.6 2012/03/06 20:34:14 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/magicrescue-1.1.9.ebuild,v 1.7 2013/04/11 06:17:30 patrick Exp $ EAPI=4 @@ -20,6 +20,7 @@ RDEPEND="${DEPEND}" src_prepare() { epatch "${FILESDIR}"/${P}-makefile.patch + epatch "${FILESDIR}"/${P}-ldflags.patch tc-export CC } |