diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2016-05-24 00:55:11 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2016-08-13 16:14:15 +0100 |
| commit | 0c4e6ee20113d28416412a805085559b7a0c4e46 (patch) | |
| tree | 471d53261c3f7e24236f525ade9f35382e712c4e | |
| parent | 81da0d077a7a0539a50691f49f31c91ec75c9a37 (diff) | |
| download | gstreamer-plugins-bad-0c4e6ee20113d28416412a805085559b7a0c4e46.tar.gz | |
g-i: pass compiler env to g-ir-scanner
It's what introspection.mak does as well. Should
fix spurious build failures on gnome-continuous.
| -rw-r--r-- | gst-libs/gst/gl/Makefile.am | 1 | ||||
| -rw-r--r-- | gst-libs/gst/insertbin/Makefile.am | 1 | ||||
| -rw-r--r-- | gst-libs/gst/mpegts/Makefile.am | 1 | ||||
| -rw-r--r-- | gst-libs/gst/player/Makefile.am | 4 |
4 files changed, 6 insertions, 1 deletions
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am index f1cb9e178..3f04a519e 100644 --- a/gst-libs/gst/gl/Makefile.am +++ b/gst-libs/gst/gl/Makefile.am @@ -152,6 +152,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstgl_@GST_API_VERSION@_la_SOURCES)) GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ + CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \ $(INTROSPECTION_SCANNER) -v --namespace GstGL \ --nsversion=@GST_API_VERSION@ \ --identifier-prefix=Gst \ diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am index 8368f41b0..1f8ea307c 100644 --- a/gst-libs/gst/insertbin/Makefile.am +++ b/gst-libs/gst/insertbin/Makefile.am @@ -31,6 +31,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources)) GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ + CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \ $(INTROSPECTION_SCANNER) -v --namespace GstInsertBin \ --nsversion=@GST_API_VERSION@ \ --identifier-prefix=Gst \ diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am index cd8b8ad40..aeea32ee7 100644 --- a/gst-libs/gst/mpegts/Makefile.am +++ b/gst-libs/gst/mpegts/Makefile.am @@ -65,6 +65,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources)) GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ + CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \ $(INTROSPECTION_SCANNER) -v --namespace GstMpegts \ --nsversion=@GST_API_VERSION@ \ --identifier-prefix=GstMpegts \ diff --git a/gst-libs/gst/player/Makefile.am b/gst-libs/gst/player/Makefile.am index 611d1fc06..042622be0 100644 --- a/gst-libs/gst/player/Makefile.am +++ b/gst-libs/gst/player/Makefile.am @@ -57,7 +57,9 @@ gir_headers=$(patsubst %,$(srcdir)/%, $(libgstplayer_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstplayer_@GST_API_VERSION@_la_SOURCES)) GstPlayer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstplayer-@GST_API_VERSION@.la - $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ + $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no GI_SCANNER_DISABLE_CACHE=yes \ + CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \ + PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(INTROSPECTION_SCANNER) -v --namespace GstPlayer \ --nsversion=@GST_API_VERSION@ \ --warn-all \ |