From c9128ad6a15be274210d65fe387ebcc0e96a5075 Mon Sep 17 00:00:00 2001
From: Thomas Zander <thomas.e.zander@googlemail.com>
Date: Thu, 29 Oct 2015 14:18:56 +0100
Subject: [PATCH] Make.lite: Proper detection Darwin/x86_64

- Use uname -m for Darwin/i386 platform
  (uname -p returns i386 on Mac OS)
- Darwin does have sys/param.h; allow correct flac_min/flac_max macro
  expansion

Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
---
 build/config.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/config.mk b/build/config.mk
index 0476ddc5..ad1a9e06 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -63,6 +63,12 @@ endif
 ifeq ($(PROC),powerpc)
     PROC := ppc
 endif
+# x64_64 Mac OS outputs 'i386' in uname -p; use uname -m instead
+ifeq ($(PROC),i386)
+    ifeq ($(OS),Darwin)
+        PROC := $(shell uname -m)
+    endif
+endif
 
 ifeq ($(OS),Linux)
     PROC := $(shell uname -m)
@@ -93,7 +99,7 @@ VERSION=\"1.3.1\"
 CONFIG_CFLAGS=$(CUSTOM_CFLAGS) -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 ifeq ($(OS),Darwin)
-    CONFIG_CFLAGS += -DFLAC__SYS_DARWIN -arch $(PROC)
+    CONFIG_CFLAGS += -DFLAC__SYS_DARWIN -DHAVE_SYS_PARAM_H -arch $(PROC)
 else
     CONFIG_CFLAGS += -DHAVE_SOCKLEN_T
 endif