Gitiles
Code Review Sign In
gerrit.openbmc.org / mdmillerii / openbmc / 36b84cde8facab568630eec811e483cf1fc50848 / . / poky / meta / recipes-multimedia / gstreamer / gstreamer1.0-plugins-base / 0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
blob: 094bdac846078c69c9cc7f102da7bb585cc389ea [file] [log] [blame]
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]1From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Nov 2015 16:53:04 +0200
4Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running
5 introspection tools
6
7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 gst-libs/gst/allocators/Makefile.am | 2 +-
11 gst-libs/gst/app/Makefile.am | 2 +-
12 gst-libs/gst/audio/Makefile.am | 2 +-
13 gst-libs/gst/fft/Makefile.am | 2 +-
14 gst-libs/gst/pbutils/Makefile.am | 2 +-
15 gst-libs/gst/riff/Makefile.am | 2 +-
16 gst-libs/gst/rtp/Makefile.am | 2 +-
17 gst-libs/gst/rtsp/Makefile.am | 2 +-
18 gst-libs/gst/sdp/Makefile.am | 2 +-
19 gst-libs/gst/tag/Makefile.am | 2 +-
20 gst-libs/gst/video/Makefile.am | 2 +-
21 11 files changed, 11 insertions(+), 11 deletions(-)
22
23diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
24index 9361bf9..bc7f53a 100644
25--- a/gst-libs/gst/allocators/Makefile.am
26+++ b/gst-libs/gst/allocators/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]27@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]28 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
29 --library=libgstallocators-@GST_API_VERSION@.la \
30 --include=Gst-@GST_API_VERSION@ \
31- --libtool="$(top_builddir)/libtool" \
32+ --libtool="$(LIBTOOL)" \
33 --pkg gstreamer-@GST_API_VERSION@ \
34 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \
35 --output $@ \
36diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
37index 6d6de8d..dcc2fe0 100644
38--- a/gst-libs/gst/app/Makefile.am
39+++ b/gst-libs/gst/app/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]40@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]41 --library=libgstapp-@GST_API_VERSION@.la \
42 --include=Gst-@GST_API_VERSION@ \
43 --include=GstBase-@GST_API_VERSION@ \
44- --libtool="$(top_builddir)/libtool" \
45+ --libtool="$(LIBTOOL)" \
46 --pkg gstreamer-@GST_API_VERSION@ \
47 --pkg gstreamer-base-@GST_API_VERSION@ \
48 --pkg-export gstreamer-app-@GST_API_VERSION@ \
49diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
50index 275d222..2374196 100644
51--- a/gst-libs/gst/audio/Makefile.am
52+++ b/gst-libs/gst/audio/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]53@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]54 --include=Gst-@GST_API_VERSION@ \
55 --include=GstBase-@GST_API_VERSION@ \
56 --include=GstTag-@GST_API_VERSION@ \
57- --libtool="$(top_builddir)/libtool" \
58+ --libtool="$(LIBTOOL)" \
59 --pkg gstreamer-@GST_API_VERSION@ \
60 --pkg gstreamer-base-@GST_API_VERSION@ \
61 --pkg-export gstreamer-audio-@GST_API_VERSION@ \
62diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
63index 09b3d68..f545354 100644
64--- a/gst-libs/gst/fft/Makefile.am
65+++ b/gst-libs/gst/fft/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]66@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]67 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
68 --library=libgstfft-@GST_API_VERSION@.la \
69 --include=Gst-@GST_API_VERSION@ \
70- --libtool="$(top_builddir)/libtool" \
71+ --libtool="$(LIBTOOL)" \
72 --pkg gstreamer-@GST_API_VERSION@ \
73 --pkg-export gstreamer-fft-@GST_API_VERSION@ \
74 --output $@ \
75diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
76index 64d5eb0..91dc214 100644
77--- a/gst-libs/gst/pbutils/Makefile.am
78+++ b/gst-libs/gst/pbutils/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]79@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]80 --include=GstTag-@GST_API_VERSION@ \
81 --include=GstVideo-@GST_API_VERSION@ \
82 --include=GstAudio-@GST_API_VERSION@ \
83- --libtool="$(top_builddir)/libtool" \
84+ --libtool="$(LIBTOOL)" \
85 --pkg gstreamer-@GST_API_VERSION@ \
86 --pkg gstreamer-tag-@GST_API_VERSION@ \
87 --pkg gstreamer-video-@GST_API_VERSION@ \
88diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
89index 83d83cb..3bd8fc0 100644
90--- a/gst-libs/gst/riff/Makefile.am
91+++ b/gst-libs/gst/riff/Makefile.am
92@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
93 # --include=GstAudio-@GST_API_VERSION@ \
94 # --include=GstTag-@GST_API_VERSION@ \
95 # --include=Gst-@GST_API_VERSION@ \
96-# --libtool="$(top_builddir)/libtool" \
97+# --libtool="$(LIBTOOL)" \
98 # --pkg gstreamer-@GST_API_VERSION@ \
99 # --pkg gstreamer-tag-@GST_API_VERSION@ \
100 # --pkg gstreamer-audio-@GST_API_VERSION@ \
101diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
102index fdd01c1..f5445c1 100644
103--- a/gst-libs/gst/rtp/Makefile.am
104+++ b/gst-libs/gst/rtp/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]105@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]106 --library=libgstrtp-@GST_API_VERSION@.la \
107 --include=Gst-@GST_API_VERSION@ \
108 --include=GstBase-@GST_API_VERSION@ \
109- --libtool="$(top_builddir)/libtool" \
110+ --libtool="$(LIBTOOL)" \
111 --pkg gstreamer-@GST_API_VERSION@ \
112 --pkg gstreamer-base-@GST_API_VERSION@ \
113 --pkg-export gstreamer-rtp-@GST_API_VERSION@ \
114diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
115index ede5706..9b0b258 100644
116--- a/gst-libs/gst/rtsp/Makefile.am
117+++ b/gst-libs/gst/rtsp/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]118@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]119 --include=Gio-2.0 \
120 --include=Gst-@GST_API_VERSION@ \
121 --include=GstSdp-@GST_API_VERSION@ \
122- --libtool="$(top_builddir)/libtool" \
123+ --libtool="$(LIBTOOL)" \
124 --pkg gio-2.0 \
125 --pkg gstreamer-@GST_API_VERSION@ \
126 --pkg gstreamer-sdp-@GST_API_VERSION@ \
127diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
128index a90f30b..0e149b8 100644
129--- a/gst-libs/gst/sdp/Makefile.am
130+++ b/gst-libs/gst/sdp/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]131@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]132 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
133 --library=libgstsdp-@GST_API_VERSION@.la \
134 --include=Gst-@GST_API_VERSION@ \
135- --libtool="$(top_builddir)/libtool" \
136+ --libtool="$(LIBTOOL)" \
137 --pkg gstreamer-@GST_API_VERSION@ \
138 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \
139 --output $@ \
140diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
141index c534a4d..cafafd3 100644
142--- a/gst-libs/gst/tag/Makefile.am
143+++ b/gst-libs/gst/tag/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]144@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]145 --library=libgsttag-@GST_API_VERSION@.la \
146 --include=Gst-@GST_API_VERSION@ \
147 --include=GstBase-@GST_API_VERSION@ \
148- --libtool="$(top_builddir)/libtool" \
149+ --libtool="$(LIBTOOL)" \
150 --pkg gstreamer-@GST_API_VERSION@ \
151 --pkg gstreamer-base-@GST_API_VERSION@ \
152 --pkg-export gstreamer-tag-@GST_API_VERSION@ \
153diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
154index 5d31fa1..ac64eb3 100644
155--- a/gst-libs/gst/video/Makefile.am
156+++ b/gst-libs/gst/video/Makefile.am
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600[diff] [blame]157@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]158 --library=libgstvideo-@GST_API_VERSION@.la \
159 --include=Gst-@GST_API_VERSION@ \
160 --include=GstBase-@GST_API_VERSION@ \
161- --libtool="$(top_builddir)/libtool" \
162+ --libtool="$(LIBTOOL)" \
163 --pkg gstreamer-@GST_API_VERSION@ \
164 --pkg gstreamer-base-@GST_API_VERSION@ \
165 --pkg-export gstreamer-video-@GST_API_VERSION@ \
166--
1672.6.2
168