diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2014-08-06 14:11:16 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2014-08-06 14:11:16 +0000 |
| commit | 9d7296e12b83bfafbf3edb19477bbe01b8fb3fec (patch) | |
| tree | d7da5c0c645c4b05cd070bc32b9599f184fd3095 /sysutils/dd_rescue | |
| parent | mail/squirrelmail-password_forget-plugin: reset maintainer per request (diff) | |
Fix build on amd64.
PR: 192364
Submitted by: Ivan Klymenko <fidaj@ukr.net>
MFH: 2014Q3
Diffstat (limited to 'sysutils/dd_rescue')
| -rw-r--r-- | sysutils/dd_rescue/files/patch-Makefile | 11 | ||||
| -rw-r--r-- | sysutils/dd_rescue/files/patch-fmt_no.h | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/sysutils/dd_rescue/files/patch-Makefile b/sysutils/dd_rescue/files/patch-Makefile index 0545c06346ac..83bf0cedb4a3 100644 --- a/sysutils/dd_rescue/files/patch-Makefile +++ b/sysutils/dd_rescue/files/patch-Makefile @@ -1,5 +1,5 @@ --- Makefile.orig 2014-05-27 20:31:21.000000000 +0900 -+++ Makefile 2014-06-29 01:15:59.000000000 +0900 ++++ Makefile 2014-08-06 21:41:59.000000000 +0900 @@ -6,10 +6,7 @@ DESTDIR = @@ -34,6 +34,15 @@ HAVE_AVX2 := $(shell echo "" | $(CC) -mavx2 -xc - 2>&1 | grep unrecognized || echo 1) HAVE_SSE42 := $(shell echo "" | $(CC) -msse4.2 -xc - 2>&1 | grep unrecognized || echo 1) +@@ -74,7 +65,7 @@ + endif + endif + +-ifeq ($(MACH),x86_64) ++ifeq ($(MACH),amd64) + LIB = lib64 + OBJECTS2 = find_nonzero_sse2.o + ifeq ($(HAVE_SSE42),1) @@ -180,7 +171,7 @@ $(CC) $(CFLAGS) -DNO_LIBDL $(DEFINES) $< $(OUT) $(OBJECTS) $(OBJECTS2) $(LIBDIR)/libfallocate.a diff --git a/sysutils/dd_rescue/files/patch-fmt_no.h b/sysutils/dd_rescue/files/patch-fmt_no.h index 88f1326c9604..40047a93a795 100644 --- a/sysutils/dd_rescue/files/patch-fmt_no.h +++ b/sysutils/dd_rescue/files/patch-fmt_no.h @@ -1,10 +1,10 @@ ---- fmt_no.h.orig 2014-06-29 00:25:12.000000000 +0900 -+++ fmt_no.h 2014-06-29 00:28:32.000000000 +0900 +--- fmt_no.h.orig 2014-08-06 22:50:41.000000000 +0900 ++++ fmt_no.h 2014-08-06 22:51:11.000000000 +0900 @@ -4,6 +4,8 @@ #define _FMT_NO_H #include <sys/types.h> -+typedef long long loff_t; ++#include "ddr_ctrl.h" + char* fmt_int_b(unsigned char pre, unsigned char post, unsigned int scale, loff_t no, const char* bold, const char* norm, |