From b70aa8f2a798de813ad51cdd7e1a1b6c779761e8 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 9 Mar 2017 15:59:12 +0100 Subject: [PATCH] Really add fix for missing_build_ids_terminate_build without __debug_package. --- 0013-missing_build_ids_terminate_build.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 0013-missing_build_ids_terminate_build.patch diff --git a/0013-missing_build_ids_terminate_build.patch b/0013-missing_build_ids_terminate_build.patch new file mode 100644 index 0000000..95dc37a --- /dev/null +++ b/0013-missing_build_ids_terminate_build.patch @@ -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;