Gitiles
Code Review Sign In
gerrit.openbmc.org / stefanberger / openbmc / c7537e7c9f1306129bc0f793c217c6646191b45e / . / poky / meta / recipes-multimedia / gstreamer / gstreamer1.0-plugins-base / 0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
blob: bcada34c40940e6a65dd56186a650c6d1f45ed4d [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]1From 7022b87353a37b78bae7cf0106a4e47913bb5c97 Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]2From: Alexander Kanavin <alex.kanavin@gmail.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]3Date: Thu, 5 Apr 2018 10:15:08 +0800
4Subject: [PATCH] Makefile.am: don't hardcode libtool name when running
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]5 introspection tools
6
7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]11---
12 gst-libs/gst/allocators/Makefile.am | 2 +-
13 gst-libs/gst/app/Makefile.am | 2 +-
14 gst-libs/gst/audio/Makefile.am | 2 +-
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]15 gst-libs/gst/gl/Makefile.am | 2 +-
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]16 gst-libs/gst/pbutils/Makefile.am | 2 +-
17 gst-libs/gst/riff/Makefile.am | 2 +-
18 gst-libs/gst/rtp/Makefile.am | 2 +-
19 gst-libs/gst/rtsp/Makefile.am | 2 +-
20 gst-libs/gst/sdp/Makefile.am | 2 +-
21 gst-libs/gst/tag/Makefile.am | 2 +-
22 gst-libs/gst/video/Makefile.am | 2 +-
23 11 files changed, 11 insertions(+), 11 deletions(-)
24
25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]26index 1957d28..1ecc950 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]27--- a/gst-libs/gst/allocators/Makefile.am
28+++ b/gst-libs/gst/allocators/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]29@@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]30 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
31 --library=libgstallocators-@GST_API_VERSION@.la \
32 --include=Gst-@GST_API_VERSION@ \
33- --libtool="$(top_builddir)/libtool" \
34+ --libtool="$(LIBTOOL)" \
35 --pkg gstreamer-@GST_API_VERSION@ \
36 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \
37 --output $@ \
38diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]39index 52f6ad3..5bfd606 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]40--- a/gst-libs/gst/app/Makefile.am
41+++ b/gst-libs/gst/app/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]42@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]43 --library=libgstapp-@GST_API_VERSION@.la \
44 --include=Gst-@GST_API_VERSION@ \
45 --include=GstBase-@GST_API_VERSION@ \
46- --libtool="$(top_builddir)/libtool" \
47+ --libtool="$(LIBTOOL)" \
48 --pkg gstreamer-@GST_API_VERSION@ \
49 --pkg gstreamer-base-@GST_API_VERSION@ \
50 --pkg-export gstreamer-app-@GST_API_VERSION@ \
51diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]52index 2922245..7fb65f2 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]53--- a/gst-libs/gst/audio/Makefile.am
54+++ b/gst-libs/gst/audio/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]55@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]56 --include=Gst-@GST_API_VERSION@ \
57 --include=GstBase-@GST_API_VERSION@ \
58 --include=GstTag-@GST_API_VERSION@ \
59- --libtool="$(top_builddir)/libtool" \
60+ --libtool="$(LIBTOOL)" \
61 --pkg gstreamer-@GST_API_VERSION@ \
62 --pkg gstreamer-base-@GST_API_VERSION@ \
63 --pkg-export gstreamer-audio-@GST_API_VERSION@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]64diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
65index 4e77e8c..3276d7f 100644
66--- a/gst-libs/gst/gl/Makefile.am
67+++ b/gst-libs/gst/gl/Makefile.am
68@@ -193,7 +193,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]69 --include=Gst-@GST_API_VERSION@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]70 --include=GstBase-@GST_API_VERSION@ \
71 --include=GstVideo-@GST_API_VERSION@ \
72- --libtool="${LIBTOOL}" \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]73+ --libtool="$(LIBTOOL)" \
74 --pkg gstreamer-@GST_API_VERSION@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]75 --pkg gstreamer-base-@GST_API_VERSION@ \
76 --pkg gstreamer-video-@GST_API_VERSION@ \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]77diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]78index ae51993..35a6e44 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]79--- a/gst-libs/gst/pbutils/Makefile.am
80+++ b/gst-libs/gst/pbutils/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]81@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]82 --include=GstTag-@GST_API_VERSION@ \
83 --include=GstVideo-@GST_API_VERSION@ \
84 --include=GstAudio-@GST_API_VERSION@ \
85- --libtool="$(top_builddir)/libtool" \
86+ --libtool="$(LIBTOOL)" \
87 --pkg gstreamer-@GST_API_VERSION@ \
88 --pkg gstreamer-tag-@GST_API_VERSION@ \
89 --pkg gstreamer-video-@GST_API_VERSION@ \
90diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]91index fb53f06..e66ef4f 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]92--- a/gst-libs/gst/riff/Makefile.am
93+++ b/gst-libs/gst/riff/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]94@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]95 # --include=GstAudio-@GST_API_VERSION@ \
96 # --include=GstTag-@GST_API_VERSION@ \
97 # --include=Gst-@GST_API_VERSION@ \
98-# --libtool="$(top_builddir)/libtool" \
99+# --libtool="$(LIBTOOL)" \
100 # --pkg gstreamer-@GST_API_VERSION@ \
101 # --pkg gstreamer-tag-@GST_API_VERSION@ \
102 # --pkg gstreamer-audio-@GST_API_VERSION@ \
103diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]104index a6f971d..77ebeeb 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]105--- a/gst-libs/gst/rtp/Makefile.am
106+++ b/gst-libs/gst/rtp/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]107@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]108 --library=libgstrtp-@GST_API_VERSION@.la \
109 --include=Gst-@GST_API_VERSION@ \
110 --include=GstBase-@GST_API_VERSION@ \
111- --libtool="$(top_builddir)/libtool" \
112+ --libtool="$(LIBTOOL)" \
113 --pkg gstreamer-@GST_API_VERSION@ \
114 --pkg gstreamer-base-@GST_API_VERSION@ \
115 --pkg-export gstreamer-rtp-@GST_API_VERSION@ \
116diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]117index ceb07f4..db9d0fd 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]118--- a/gst-libs/gst/rtsp/Makefile.am
119+++ b/gst-libs/gst/rtsp/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]120@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]121 --include=Gio-2.0 \
122 --include=Gst-@GST_API_VERSION@ \
123 --include=GstSdp-@GST_API_VERSION@ \
124- --libtool="$(top_builddir)/libtool" \
125+ --libtool="$(LIBTOOL)" \
126 --pkg gio-2.0 \
127 --pkg gstreamer-@GST_API_VERSION@ \
128 --pkg gstreamer-sdp-@GST_API_VERSION@ \
129diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]130index e197e9b..6e05cc7 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]131--- a/gst-libs/gst/sdp/Makefile.am
132+++ b/gst-libs/gst/sdp/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]133@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]134 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
135 --library=libgstsdp-@GST_API_VERSION@.la \
136 --include=Gst-@GST_API_VERSION@ \
137- --libtool="$(top_builddir)/libtool" \
138+ --libtool="$(LIBTOOL)" \
139 --pkg gstreamer-@GST_API_VERSION@ \
140 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \
141 --output $@ \
142diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]143index 0247c33..c86515b 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]144--- a/gst-libs/gst/tag/Makefile.am
145+++ b/gst-libs/gst/tag/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]146@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]147 --library=libgsttag-@GST_API_VERSION@.la \
148 --include=Gst-@GST_API_VERSION@ \
149 --include=GstBase-@GST_API_VERSION@ \
150- --libtool="$(top_builddir)/libtool" \
151+ --libtool="$(LIBTOOL)" \
152 --pkg gstreamer-@GST_API_VERSION@ \
153 --pkg gstreamer-base-@GST_API_VERSION@ \
154 --pkg-export gstreamer-tag-@GST_API_VERSION@ \
155diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]156index 9fc1ccf..0f8455f 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]157--- a/gst-libs/gst/video/Makefile.am
158+++ b/gst-libs/gst/video/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]159@@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]160 --library=libgstvideo-@GST_API_VERSION@.la \
161 --include=Gst-@GST_API_VERSION@ \
162 --include=GstBase-@GST_API_VERSION@ \
163- --libtool="$(top_builddir)/libtool" \
164+ --libtool="$(LIBTOOL)" \
165 --pkg gstreamer-@GST_API_VERSION@ \
166 --pkg gstreamer-base-@GST_API_VERSION@ \
167 --pkg-export gstreamer-video-@GST_API_VERSION@ \