public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gn] rawhide: Unbundle the header from `crate(cxx)` in `%conf`, not `%prep`
@ 2026-07-07 9:25 Benjamin A. Beasley
0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-07-07 9:25 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gn
Branch : rawhide
Commit : 9ef93976c9f5c0bab7374f29382bcd902f2ad191
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-07-07T10:22:39+01:00
Stats : +4/-2 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/gn/c/9ef93976c9f5c0bab7374f29382bcd902f2ad191?branch=rawhide
Log:
Unbundle the header from `crate(cxx)` in `%conf`, not `%prep`
---
diff --git a/gn.spec b/gn.spec
index 3af8a21..9bf5bcc 100644
--- a/gn.spec
+++ b/gn.spec
@@ -166,7 +166,11 @@ cp --preserve '%{SOURCE3}' '%{SOURCE4}' .
# Put the ICU license text somewhere it’s easy to install, with a unique name.
cp --preserve src/base/third_party/icu/LICENSE LICENSE-ICU
+
+%conf
%if %{without bundled_cxx}
+# Unbundle this in %%conf rather than %%prep to ensure that the dependency we
+# are trying to symlink is installed.
cxx_header='src/gn/starlark/vendor/cxx/include/cxx.h'
# Explicit removal asserts that we still have the right path, failing if the
# file does not exist.
@@ -177,8 +181,6 @@ system_cxx_header="$(
ln --symbolic --verbose "${system_cxx_header}" "${cxx_header}"
%endif
-
-%conf
AR='gcc-ar'; export AR
# Treating warnings as errors is too strict for downstream builds.
#
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-07 9:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-07 9:25 [rpms/gn] rawhide: Unbundle the header from `crate(cxx)` in `%conf`, not `%prep` Benjamin A. Beasley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox