diff options
| author | jstebbins <[email protected]> | 2015-01-15 19:15:27 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2015-01-15 19:15:27 +0000 |
| commit | 2b4aa91b2f32e802f8df7831e36be9fb4c930460 (patch) | |
| tree | 3033f570a3a0be1941235e428688e04a377d4437 | |
| parent | f9ebf603e5d700254643208e9604eb3cb9e59d8f (diff) | |
build: fix configure environment of several contribs
Incorrect build environment caused a failure to disable asserts in
libdvdnav which leads to crashes. Probably other undesirable side effects
as well.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6756 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/libbluray/module.defs | 4 | ||||
| -rw-r--r-- | contrib/libdvdnav/module.defs | 4 | ||||
| -rw-r--r-- | contrib/libdvdread/module.defs | 4 | ||||
| -rw-r--r-- | contrib/libgnurx/module.defs | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs index 5a7b610e3..868b25147 100644 --- a/contrib/libbluray/module.defs +++ b/contrib/libbluray/module.defs @@ -16,6 +16,6 @@ endif LIBBLURAY.CONFIGURE.extra += --disable-examples ifeq (1,$(FEATURE.local_pkgconfig)) - LIBBLURAY.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" - LIBBLURAY.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + LIBBLURAY.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + LIBBLURAY.BUILD.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" endif diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs index b6ba27a66..27f171be8 100644 --- a/contrib/libdvdnav/module.defs +++ b/contrib/libdvdnav/module.defs @@ -9,6 +9,6 @@ ifneq (max,$(LIBDVDNAV.GCC.g)) endif ifeq (1,$(FEATURE.local_pkgconfig)) - LIBDVDNAV.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" - LIBDVDNAV.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + LIBDVDNAV.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + LIBDVDNAV.BUILD.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" endif diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs index c546b3b17..bf05121d3 100644 --- a/contrib/libdvdread/module.defs +++ b/contrib/libdvdread/module.defs @@ -9,6 +9,6 @@ ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) endif ifeq (1,$(FEATURE.local_pkgconfig)) - LIBDVDREAD.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" - LIBDVDREAD.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + LIBDVDREAD.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + LIBDVDREAD.BUILD.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" endif diff --git a/contrib/libgnurx/module.defs b/contrib/libgnurx/module.defs index 3d73829f7..e8e2ebe0c 100644 --- a/contrib/libgnurx/module.defs +++ b/contrib/libgnurx/module.defs @@ -22,6 +22,6 @@ define LIBGNURX.UNINSTALL endef ifeq (1,$(FEATURE.local_pkgconfig)) - LIBGNURX.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" - LIBGNURX.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + LIBGNURX.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + LIBGNURX.BUILD.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" endif |