rpms
/
rpm
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Really add fix for missing_build_ids_terminate_build without __debug_package.

This commit is contained in:
Mark Wielaard 2017-03-09 15:59:12 +01:00
parent f66868c678
commit b70aa8f2a7
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
0013-missing_build_ids_terminate_build.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/build/files.c b/build/files.c
index 26f53bd..8b516c6 100644
--- a/build/files.c
+++ b/build/files.c
@@ -1699,7 +1699,11 @@ static int generateBuildIDs(FileList fl)
if (build_id_links == BUILD_IDS_NONE || rc != 0)
return rc;
- int terminate = rpmExpandNumeric("%{?_missing_build_ids_terminate_build}");
+ /* Historically we have only checked build_ids when __debug_package
+ was defined. So don't terminate the build if __debug_package is
+ unset, even when _missing_build_ids_terminate_build is. */
+ int terminate = (rpmExpandNumeric("%{?_missing_build_ids_terminate_build}")
+ && rpmExpandNumeric("%{?__debug_package}"));
/* Collect and check all build-ids for ELF files in this package. */
int needMain = 0;