svn commit: r364175 - head/sysutils/dd_rescue/files

[MANTANI Nobutaka]

Author: nobutaka
Date: Wed Aug  6 14:11:16 2014
New Revision: 364175
URL: http://svnweb.freebsd.org/changeset/ports/364175
QAT: https://qat.redports.org/buildarchive/r364175/

Log:
  Fix build on amd64.
  
  PR:		192364
  Submitted by:	Ivan Klymenko <fidaj at ukr.net>
  MFH:		2014Q3

Modified:
  head/sysutils/dd_rescue/files/patch-Makefile
  head/sysutils/dd_rescue/files/patch-fmt_no.h

Modified: head/sysutils/dd_rescue/files/patch-Makefile
==============================================================================
--- head/sysutils/dd_rescue/files/patch-Makefile	Wed Aug  6 14:11:10 2014	(r364174)
+++ head/sysutils/dd_rescue/files/patch-Makefile	Wed Aug  6 14:11:16 2014	(r364175)
@@ -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
  

Modified: head/sysutils/dd_rescue/files/patch-fmt_no.h
==============================================================================
--- head/sysutils/dd_rescue/files/patch-fmt_no.h	Wed Aug  6 14:11:10 2014	(r364174)
+++ head/sysutils/dd_rescue/files/patch-fmt_no.h	Wed Aug  6 14:11:16 2014	(r364175)
@@ -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,