diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch b/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch index 8989dcebd1..652e30b3e4 100644 --- a/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch +++ b/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From 8ce9fbab2990609bdace457e146160334e931c89 Mon Sep 17 00:00:00 2001 | 1 | From 792693bb90768cfde4898e8dd31ee1b5de803d2f Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 8 Jun 2017 17:08:09 +0300 | 3 | Date: Thu, 8 Jun 2017 17:08:09 +0300 |
4 | Subject: [PATCH 14/15] build/pack.c: remove static local variables from | 4 | Subject: [PATCH] build/pack.c: remove static local variables from buildHost() |
5 | buildHost() and getBuildTime() | 5 | and getBuildTime() |
6 | 6 | ||
7 | Their use is causing difficult to diagnoze data races when building multiple | 7 | Their use is causing difficult to diagnoze data races when building multiple |
8 | packages in parallel, and is a bad idea in general, as it also makes it more | 8 | packages in parallel, and is a bad idea in general, as it also makes it more |
@@ -20,7 +20,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
20 | 3 files changed, 74 insertions(+), 72 deletions(-) | 20 | 3 files changed, 74 insertions(+), 72 deletions(-) |
21 | 21 | ||
22 | diff --git a/build/build.c b/build/build.c | 22 | diff --git a/build/build.c b/build/build.c |
23 | index 81152e53e..6001f9e52 100644 | 23 | index 13c3df2..b154f08 100644 |
24 | --- a/build/build.c | 24 | --- a/build/build.c |
25 | +++ b/build/build.c | 25 | +++ b/build/build.c |
26 | @@ -6,6 +6,8 @@ | 26 | @@ -6,6 +6,8 @@ |
@@ -99,7 +99,7 @@ index 81152e53e..6001f9e52 100644 | |||
99 | if (((what & RPMBUILD_PACKAGESOURCE) && !test) && | 99 | if (((what & RPMBUILD_PACKAGESOURCE) && !test) && |
100 | - (rc = packageSources(spec, &cookie))) | 100 | - (rc = packageSources(spec, &cookie))) |
101 | + (rc = packageSources(spec, &cookie, buildTime, host))) | 101 | + (rc = packageSources(spec, &cookie, buildTime, host))) |
102 | return rc; | 102 | goto exit; |
103 | 103 | ||
104 | if (((what & RPMBUILD_PACKAGEBINARY) && !test) && | 104 | if (((what & RPMBUILD_PACKAGEBINARY) && !test) && |
105 | - (rc = packageBinaries(spec, cookie, (didBuild == 0)))) | 105 | - (rc = packageBinaries(spec, cookie, (didBuild == 0)))) |
@@ -116,7 +116,7 @@ index 81152e53e..6001f9e52 100644 | |||
116 | spec->rootDir = NULL; | 116 | spec->rootDir = NULL; |
117 | if (rc != RPMRC_OK && rpmlogGetNrecs() > 0) { | 117 | if (rc != RPMRC_OK && rpmlogGetNrecs() > 0) { |
118 | diff --git a/build/pack.c b/build/pack.c | 118 | diff --git a/build/pack.c b/build/pack.c |
119 | index df15876ff..17a4b0905 100644 | 119 | index df15876..17a4b09 100644 |
120 | --- a/build/pack.c | 120 | --- a/build/pack.c |
121 | +++ b/build/pack.c | 121 | +++ b/build/pack.c |
122 | @@ -6,8 +6,6 @@ | 122 | @@ -6,8 +6,6 @@ |
@@ -305,7 +305,7 @@ index df15876ff..17a4b0905 100644 | |||
305 | /* Do check SRPM package if enabled */ | 305 | /* Do check SRPM package if enabled */ |
306 | if (rc == RPMRC_OK && pkgcheck[0] != ' ') { | 306 | if (rc == RPMRC_OK && pkgcheck[0] != ' ') { |
307 | diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h | 307 | diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h |
308 | index 439b7d3b5..07e8338ad 100644 | 308 | index 439b7d3..07e8338 100644 |
309 | --- a/build/rpmbuild_internal.h | 309 | --- a/build/rpmbuild_internal.h |
310 | +++ b/build/rpmbuild_internal.h | 310 | +++ b/build/rpmbuild_internal.h |
311 | @@ -427,19 +427,23 @@ rpmRC processSourceFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags); | 311 | @@ -427,19 +427,23 @@ rpmRC processSourceFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags); |
@@ -334,6 +334,3 @@ index 439b7d3b5..07e8338ad 100644 | |||
334 | 334 | ||
335 | RPM_GNUC_INTERNAL | 335 | RPM_GNUC_INTERNAL |
336 | int addLangTag(rpmSpec spec, Header h, rpmTagVal tag, | 336 | int addLangTag(rpmSpec spec, Header h, rpmTagVal tag, |
337 | -- | ||
338 | 2.14.2 | ||
339 | |||