diff options
Diffstat (limited to 'app-forensics/magicrescue/files')
-rw-r--r-- | app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch | 50 | ||||
-rw-r--r-- | app-forensics/magicrescue/files/magicrescue-1.1.9-makefile.patch | 52 |
2 files changed, 102 insertions, 0 deletions
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/files/magicrescue-1.1.9-makefile.patch b/app-forensics/magicrescue/files/magicrescue-1.1.9-makefile.patch new file mode 100644 index 000000000000..3f57b1303c6e --- /dev/null +++ b/app-forensics/magicrescue/files/magicrescue-1.1.9-makefile.patch @@ -0,0 +1,52 @@ +--- magicrescue-1.1.9/Makefile.in.orig ++++ magicrescue-1.1.9/Makefile.in +@@ -57,34 +57,31 @@ + maintainer-clean: distclean docs-clean + + install: all +- [ -d $(PREFIX) ] ++ mkdir -p $(DESTDIR)$(PREFIX)/share/magicrescue/tools \ ++ $(DESTDIR)$(PREFIX)/share/magicrescue/recipes \ ++ $(DESTDIR)$(PREFIX)/share/man/man1 \ ++ $(DESTDIR)$(PREFIX)/bin + +- mkdir -p $(PREFIX)/share/magicrescue/tools \ +- $(PREFIX)/share/magicrescue/recipes \ +- $(PREFIX)/man/man1 \ +- $(PREFIX)/bin +- +- cp magicrescue$(EXE) dupemap$(EXE) magicsort $(PREFIX)/bin/ +- cp recipes/* $(PREFIX)/share/magicrescue/recipes/ +- cp $(DOCS) $(PREFIX)/man/man1 ++ cp magicrescue$(EXE) dupemap$(EXE) magicsort $(DESTDIR)$(PREFIX)/bin ++ cp recipes/* $(DESTDIR)$(PREFIX)/share/magicrescue/recipes/ ++ cp $(DOCS) $(DESTDIR)$(PREFIX)/share/man/man1 + + for f in tools/*; do \ + if [ -x "$$f" ]; then \ +- cp -f "$$f" $(PREFIX)/share/magicrescue/tools/; \ ++ cp -f "$$f" $(DESTDIR)$(PREFIX)/share/magicrescue/tools/; \ + fi; \ + done + + uninstall: +- [ -d $(PREFIX) ] +- rm -f $(PREFIX)/bin/magicrescue$(EXE) +- rm -f $(PREFIX)/bin/dupemap$(EXE) +- rm -f $(PREFIX)/bin/magicsort ++ rm -f $(DESTDIR)$(PREFIX)/bin/magicrescue$(EXE) ++ rm -f $(DESTDIR)$(PREFIX)/bin/dupemap$(EXE) ++ rm -f $(DESTDIR)$(PREFIX)/bin/magicsort + for f in $(DOCS); do \ +- rm -f "$(PREFIX)/man/man1/`basename $$f`"; \ ++ rm -f "$(DESTDIR)$(PREFIX)/share/man/man1/`basename $$f`"; \ + done +- rm -rf $(PREFIX)/share/magicrescue/tools +- rm -rf $(PREFIX)/share/magicrescue/recipes +- -rmdir $(PREFIX)/share/magicrescue ++ rm -rf $(DESTDIR)$(PREFIX)/share/magicrescue/tools ++ rm -rf $(DESTDIR)$(PREFIX)/share/magicrescue/recipes ++ -rmdir $(DESTDIR)$(PREFIX)/share/magicrescue + + .PHONY: all clean distclean docs-clean maintainer-clean install uninstall docs + |