summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-01-15 19:16:25 +0000
committerjstebbins <[email protected]>2015-01-15 19:16:25 +0000
commitaf84ef431938c7dfa43ecebedab95b4c7de8c5f6 (patch)
tree53d9a96bd68af27ffc5a6f0dcf9fdbc78d1438e3 /contrib
parentb3e37a702ac87ddec82010a0e2a88d47ee00a7dc (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/branches/0.10.x@6757 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libbluray/module.defs4
-rw-r--r--contrib/libdvdnav/module.defs4
-rw-r--r--contrib/libdvdread/module.defs4
-rw-r--r--contrib/libgnurx/module.defs4
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