]> granicus.if.org Git - handbrake/commitdiff
build: Remove GCC.I and GCC.L for FreeBSD.
authorYuichiro NAITO <naito.yuichiro@gmail.com>
Tue, 27 Nov 2018 13:45:43 +0000 (22:45 +0900)
committerBradley Sepos <bradley@bradleysepos.com>
Tue, 27 Nov 2018 13:56:15 +0000 (08:56 -0500)
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.

libhb/module.defs
make/variant/freebsd.defs

index 593328b106da6c047475562b632d10c2d255ba74..e052df996554f68ed2c735851c6a81614b2d230d 100644 (file)
@@ -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
index e0855b51af0135679bcf04ff152310544e75ecb1..5959341e47b3dc1d42f3dd39b81444072d1c7369 100644 (file)
@@ -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