Fix build fail with make 4.3
This commit is contained in:
parent
3d2afbea82
commit
2964be9f64
@ -0,0 +1,38 @@
|
||||
From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
||||
Date: Thu, 12 Mar 2020 14:07:23 +0100
|
||||
Subject: [PATCH] build: Adapt to backwards incompatible change in GNU Make 4.3
|
||||
|
||||
GNU Make 4.3 has a backwards incompatible change affecting the use of
|
||||
number signs or hashes (ie., #) inside function invocations. See:
|
||||
https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
|
||||
|
||||
In this case, it would expand the '\#' in the '\n\#include \"$(h)\"'
|
||||
argument to the foreach call to '\#', not '#'. This would lead to
|
||||
spurious backslashes in front of the '#include' directives in the
|
||||
generated fs-enumtypes.c file.
|
||||
|
||||
Spotted by Ernestas Kulik.
|
||||
|
||||
https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4
|
||||
---
|
||||
common-modified/gst-glib-gen.mak | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
|
||||
index 14f1ba37..2247a41c 100644
|
||||
--- a/common-modified/gst-glib-gen.mak
|
||||
+++ b/common-modified/gst-glib-gen.mak
|
||||
@@ -6,7 +6,8 @@
|
||||
#glib_gen_prefix=gst_color_balance
|
||||
#glib_gen_basename=colorbalance
|
||||
|
||||
-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
|
||||
+hash:=\#
|
||||
+enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")
|
||||
|
||||
# these are all the rules generating the relevant files
|
||||
$(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
Name: farstream02
|
||||
Version: 0.2.8
|
||||
Release: 3
|
||||
Release: 4
|
||||
Summary: Audio/Video Communications Framework
|
||||
License: LGPLv2+ and GPLv2+
|
||||
URL: http://www.freedesktop.org/wiki/Software/Farstream
|
||||
Source0: http://freedesktop.org/software/farstream/releases/farstream/farstream-%{version}.tar.gz
|
||||
|
||||
BuildRequires: libnice-devel >= 0.1.3 gstreamer1-devel >= 1.0.0 python-devel
|
||||
Patch0001: build-Adapt-to-backwards-incompatible-change-in-GNU-Make-4.3.patch
|
||||
|
||||
BuildRequires: libnice-devel >= 0.1.3 gstreamer1-devel >= 1.0.0 python-devel autoconf
|
||||
BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 gupnp-igd-devel gobject-introspection-devel
|
||||
Requires: gstreamer1-plugins-good >= 1.0.0 gstreamer1-plugins-bad-free >= 1.0.0 libnice-gstreamer1
|
||||
|
||||
@ -26,6 +28,7 @@ Development files of farstream.
|
||||
%autosetup -n farstream-%{version} -p1
|
||||
|
||||
%build
|
||||
autoreconf --force --install
|
||||
%configure
|
||||
%make_build
|
||||
|
||||
@ -64,5 +67,8 @@ Development files of farstream.
|
||||
%{_datadir}/gtk-doc/html/farstream-plugins-0.2/
|
||||
|
||||
%changelog
|
||||
* Fri Jul 31 2020 lingsheng <lingsheng@huawei.com> - 0.2.8-4
|
||||
- Fix build fail with make 4.3
|
||||
|
||||
* Thu Apr 23 2020 leiju <leiju4@huawei.com> - 0.2.8-3
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user