rpm/undefbuildroot.diff

16 lines
672 B
Diff

--- build/parseSpec.c.orig 2025-01-07 09:55:58.006136886 +0000
+++ build/parseSpec.c 2025-01-07 09:56:23.618086661 +0000
@@ -1321,9 +1321,11 @@ static rpmSpec parseSpec(const char *spe
rpmPushMacroFlags(spec->macros, "_top_builddir", NULL,
top_builddir, RMIL_GLOBAL, RPMMACRO_LITERAL);
- /* Undefine (!!) %_builddir so %global misuses fall through */
+ /* Undefine (!!) %_builddir and %buildroot so %global misuses fall through */
while (rpmMacroIsDefined(spec->macros, "_builddir"))
rpmPopMacro(spec->macros, "_builddir");
+ while (rpmMacroIsDefined(spec->macros, "buildroot"))
+ rpmPopMacro(spec->macros, "buildroot");
free(top_builddir);
}