public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/llvm] f45: Don't apply MOCK_OPTS twice in Makefile
@ 2026-09-16 12:28 Konrad Kleine
0 siblings, 0 replies; only message in thread
From: Konrad Kleine @ 2026-09-16 12:28 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/llvm
Branch : f45
Commit : d6633d57c8fbbb7302fdc97ced07b6c431add18b
Author : Konrad Kleine <kkleine@redhat.com>
Date : 2026-09-09T21:38:04+02:00
Stats : +4/-4 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/llvm/c/d6633d57c8fbbb7302fdc97ced07b6c431add18b?branch=f45
Log:
Don't apply MOCK_OPTS twice in Makefile
This keeps `MOCK_OPTS` but applies it individually to release
and snapshot builds.
Before in `MOCK_OPTS="--config-opts foo=bar" make` the `foo` would be
interpreted as a list instead of a string.
---
diff --git a/Makefile b/Makefile
index 1f9bdd3..58a8231 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
MOCK_CHROOT?=fedora-rawhide-$(shell uname -m)
MOCK_OPTS?=
MOCK_OPTS_COMMON=--root $(MOCK_CHROOT) --no-clean $(shell [[ -e /usr/bin/copr-builder ]] && echo "--enable-plugin tmpfs --plugin-option tmpfs:keep_mounted=True")
-MOCK_OPTS_RELEASE?=--no-clean --no-cleanup-after --without lto_build --without pgo --define "debug_package %{nil}" $(MOCK_OPTS)
-MOCK_OPTS_SNAPSHOT?=$(MOCK_OPTS_RELEASE) --with snapshot_build $(MOCK_OPTS)
+MOCK_OPTS_RELEASE?=--no-clean --no-cleanup-after --without lto_build --without pgo --define "debug_package %{nil}"
+MOCK_OPTS_SNAPSHOT?=$(MOCK_OPTS_RELEASE) --with snapshot_build
YYYYMMDD?=$(shell date +%Y%m%d)
SOURCEDIR=$(shell pwd)
SPEC=llvm.spec
@@ -83,12 +83,12 @@ scrub-chroot:
.PHONY: mockbuild-release
## Start a mock build of the release SRPM.
mockbuild-release: srpm-release get-srpm-release
- mock $(MOCK_OPTS_COMMON) $(MOCK_OPTS_RELEASE) $(srpm_path)
+ mock $(MOCK_OPTS_COMMON) $(MOCK_OPTS_RELEASE) $(MOCK_OPTS) $(srpm_path)
.PHONY: mockbuild-snapshot
## Start a mock build of the snapshot SRPM.
mockbuild-snapshot: srpm-snapshot get-srpm-snapshot
- mock $(MOCK_OPTS_COMMON) $(MOCK_OPTS_SNAPSHOT) $(srpm_path)
+ mock $(MOCK_OPTS_COMMON) $(MOCK_OPTS_SNAPSHOT) $(MOCK_OPTS) $(srpm_path)
######### Edit-last-failing-script
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-16 12:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-16 12:28 [rpms/llvm] f45: Don't apply MOCK_OPTS twice in Makefile Konrad Kleine
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox