Skip to content

Commit

Permalink
contrib: ffmpeg: do not overwrite env
Browse files Browse the repository at this point in the history
The common contrib.defs already add the env.LOCAL_PATH to the final
env, so this seems unnecessary and breaks adding the right
PKG_CONFIG_PATH for contribs to ffmpeg.
  • Loading branch information
ePirat committed Nov 21, 2020
1 parent 6e2c8a8 commit 0b6a3bb
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion contrib/ffmpeg/module.defs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ FFMPEG.CONFIGURE.deps =
FFMPEG.CONFIGURE.host =
FFMPEG.CONFIGURE.build =
FFMPEG.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
FFMPEG.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"

ifneq (,$(filter $(HOST.system),freebsd netbsd))
FFMPEG.CONFIGURE.env += CFLAGS=-I$(LOCALBASE)/include
Expand Down

0 comments on commit 0b6a3bb

Please sign in to comment.