public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/flatpak-runtime-config] f45: Add /app/lib to ld.so.conf
Date: Thu, 10 Sep 2026 21:21:59 GMT	[thread overview]
Message-ID: <178907531991.1.55907854261963319.rpms-flatpak-runtime-config-cb21196de261@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/flatpak-runtime-config
            Branch : f45
            Commit : cb21196de261fea2813b28fc337c23160e77bf74
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2025-03-24T22:21:59-04:00
            Stats  : +4/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/flatpak-runtime-config/c/cb21196de261fea2813b28fc337c23160e77bf74?branch=f45

            Log:
            Add /app/lib to ld.so.conf

When using the SDK as a replacment for FD.o/GNOME/KDE upstream's to build
with flatpak-builder, libraries will be built into /app/lib rather than in
/app/lib64 as in Fedora builds.

---
diff --git a/defaults.json.in b/defaults.json.in
index b6fb0a8..709d182 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 3327405..f13ef23 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -72,6 +72,9 @@ include /run/flatpak/ld.so.conf.d/app-*.conf
 include /app/etc/ld.so.conf
 include /app/etc/ld.so.conf.d/*.conf
 /app/%{_lib}
+%if "%{_lib}" != "lib"
+/app/lib
+%endif
 include /run/flatpak/ld.so.conf.d/runtime-*.conf
 _EOF
 

                 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=178907531991.1.55907854261963319.rpms-flatpak-runtime-config-cb21196de261@fedoraproject.org \
    --to=yselkowi@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