public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/gn] rawhide: Unbundle the header from `crate(cxx)` in `%conf`, not `%prep`
Date: Tue, 07 Jul 2026 09:25:38 GMT [thread overview]
Message-ID: <178341633878.1.2422278347517264722.rpms-gn-9ef93976c9f5@fedoraproject.org> (raw)
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.
#
reply other threads:[~2026-07-07 9:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178341633878.1.2422278347517264722.rpms-gn-9ef93976c9f5@fedoraproject.org \
--to=code@musicinmybrain.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox