public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Kalev Lember <klember@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/flatpak-runtime-config] f45: Correctly substitute /app/lib in flatpak-builder defaults.json ldflags
Date: Thu, 10 Sep 2026 21:21:48 GMT [thread overview]
Message-ID: <178907530893.1.1170468589336992217.rpms-flatpak-runtime-config-a8adb83cc2db@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/flatpak-runtime-config
Branch : f45
Commit : a8adb83cc2db8f955ee90300df649c9ff55ed4de
Author : Kalev Lember <klember@redhat.com>
Date : 2022-09-06T09:06:27+02:00
Stats : +6/-2 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/flatpak-runtime-config/c/a8adb83cc2db8f955ee90300df649c9ff55ed4de?branch=f45
Log:
Correctly substitute /app/lib in flatpak-builder defaults.json ldflags
---
diff --git a/defaults.json.in b/defaults.json.in
index 709d182..b6fb0a8 100644
--- a/defaults.json.in
+++ b/defaults.json.in
@@ -3,5 +3,5 @@
"cflags": "%{build_cflags}",
"cxxflags": "%{build_cxxflags}",
"cppflags": "",
- "ldflags": "-L/app/lib %{build_ldflags}"
+ "ldflags": "-L/app/%{_lib} %{build_ldflags}"
}
diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index 2094e33..c96f342 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -1,6 +1,6 @@
Name: flatpak-runtime-config
Version: 37
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Configuration files that live inside the flatpak runtime
Source1: 50-flatpak.conf
Source3: org.fedoraproject.Platform.appdata.xml
@@ -51,6 +51,7 @@ install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE4}
# Install flatpak-builder config file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder
sed -e 's|%%{_libdir}|%{_libdir}|' \
+ -e 's|%%{_lib}|%{_lib}|' \
-e 's|%%{build_cflags}|%{build_cflags}|' \
-e 's|%%{build_cxxflags}|%{build_cxxflags}|' \
-e 's|%%{build_ldflags}|%{build_ldflags}|' \
@@ -91,6 +92,9 @@ HOME=/root /usr/bin/fc-cache -s
%{_sysconfdir}/ld.so.conf.d/app.conf
%changelog
+* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 37-2
+- Correctly substitute /app/lib in flatpak-builder defaults.json ldflags
+
* Wed Aug 17 2022 Kalev Lember <klember@redhat.com> - 37-1
- appdata: Add F37 versions
reply other threads:[~2026-09-10 21:21 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=178907530893.1.1170468589336992217.rpms-flatpak-runtime-config-a8adb83cc2db@fedoraproject.org \
--to=klember@redhat.com \
--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