From cb21196de261fea2813b28fc337c23160e77bf74 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 24 Feb 2025 13:13:01 -0500
Subject: [PATCH] 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.
---
 defaults.json.in            | 2 +-
 flatpak-runtime-config.spec | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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