Accepting request 791908 from Documentation:Tools

OBS-URL: https://build.opensuse.org/request/show/791908
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/daps?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger 2020-04-08 17:54:23 +00:00 committed by Git OBS Bridge
commit 54cd51af17
3 changed files with 39 additions and 0 deletions

32
daps-gnu-make-4.3.patch Normal file
View File

@ -0,0 +1,32 @@
From 81f7829d0b8d115214d46e9093f3c157f9fd046b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 30 Mar 2020 17:44:08 +0200
Subject: [PATCH] Fix creation of $SPACE with GNU Make 4.3
GNU Make 4.3 has this incompatible change:
* WARNING: Backward-incompatibility!
Previously appending using '+=' to an empty variable would result in a
value starting with a space
This is eactly what the code relied on to before.
https://bugzilla.opensuse.org/show_bug.cgi?id=1168051
---
make/common_variables.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make/common_variables.mk b/make/common_variables.mk
index 3eabc3a5..8fe07d16 100644
--- a/make/common_variables.mk
+++ b/make/common_variables.mk
@@ -46,8 +46,8 @@ endif
# a space is needed, since it is not possible to replace a literal
# space (same goes for comma)
#
-SPACE :=
-SPACE +=
+empty :=
+SPACE := $(empty) $(empty)
COMMA := ,

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 2 15:32:20 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Add daps-gnu-make-4.3.patch: Fix compatibility with GNU Make 4.3.
-------------------------------------------------------------------
Mon Jan 6 15:25:56 UTC 2020 - Fridrich Strba <fstrba@suse.com>

View File

@ -48,6 +48,7 @@ URL: https://github.com/openSUSE/daps
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.rpmlintrc
Source2: %{name}-fetch-source-git
Patch0: daps-gnu-make-4.3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -164,6 +165,7 @@ for upgrade instructions.
#--------------------------------------------------------------------------
%prep
%setup -q -n %{name}
%patch0 -p1
#%%patch1 -p1
# Correct shebang line as suggested in