From: Yuichiro NAITO <naito.yuichiro@gmail.com>
Date: Tue, 27 Nov 2018 13:45:43 +0000 (+0900)
Subject: build: Remove GCC.I and GCC.L for FreeBSD.
X-Git-Tag: 1.2.0~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe9ecc0162219df12be08a7529df9486702d1938;p=handbrake

build: Remove GCC.I and GCC.L for FreeBSD.

It is too strong configuration that forces to search for the specific path first.
If contrib library (ex. x265) is installed from Ports, and Ports library
version is different from contrib, "GCC.I=/usr/local/include" look up Ports
library headers first and it can be different definitions from contrib headers.
We should look up contrib headers before Ports library headers.
---

diff --git a/libhb/module.defs b/libhb/module.defs
index 593328b10..e052df996 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -49,6 +49,7 @@ LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
 LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
 
 ifeq ($(BUILD.system),freebsd)
+    LIBHB.GCC.I += $(LOCALBASE)/include
     LIBHB.GCC.I += $(LOCALBASE)/include/libxml2
 else ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
     LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
diff --git a/make/variant/freebsd.defs b/make/variant/freebsd.defs
index e0855b51a..5959341e4 100644
--- a/make/variant/freebsd.defs
+++ b/make/variant/freebsd.defs
@@ -3,8 +3,6 @@ LOCALBASE  ?= /usr/local
 
 TARGET.dylib.ext = .so
 
-GCC.I       = $(LOCALBASE)/include
-GCC.L       = $(LOCALBASE)/lib
 GCC.D       = LIBICONV_PLUG
 
 GCC.args.dylib = -shared