From ade9c48828e3247329f7f9db6b30ba1b98fc1f00 Mon Sep 17 00:00:00 2001
From: SoapyMan <ishurumov@gmail.com>
Date: Sun, 2 Apr 2023 01:43:54 +0600
Subject: [PATCH] - add ld.so.conf for flatpak - more stuff to setup 32 bit
 platform

---
 .flatpak/ld.so.conf                 |  5 +++++
 io.github.opendriver.redriver2.yaml | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 .flatpak/ld.so.conf

diff --git a/.flatpak/ld.so.conf b/.flatpak/ld.so.conf
new file mode 100644
index 00000000..76daf657
--- /dev/null
+++ b/.flatpak/ld.so.conf
@@ -0,0 +1,5 @@
+# We just make any GL32 extension have higher priority
+include /run/flatpak/ld.so.conf.d/app-*-org.freedesktop.Platform.GL32.*.conf
+/app/lib32
+/app/lib/i386-linux-gnu
+/lib64
\ No newline at end of file
diff --git a/io.github.opendriver.redriver2.yaml b/io.github.opendriver.redriver2.yaml
index ba473be4..91a6d90f 100644
--- a/io.github.opendriver.redriver2.yaml
+++ b/io.github.opendriver.redriver2.yaml
@@ -57,15 +57,24 @@ cleanup:
 
 modules:
 
-- name: ld-i386
+- name: platform-bootstrap
   buildsystem: simple
   build-commands:
-  - mkdir -p /app/lib/i386-linux-gnu /app/lib/debug/lib/i386-linux-gnu
-  - install -Dm644 -t /app/etc ld.so.conf 
+  - |
+    set -e
+    mkdir -p /app/bin
+    mkdir -p /app/lib/i386-linux-gnu
+    mkdir -p /app/lib/debug/lib/i386-linux-gnu
+    mkdir -p /app/lib/i386-linux-gnu/GL
+    cp /usr/bin/addr2line /app/bin/
+    cp /usr/lib/x86_64-linux-gnu/libbfd-*.so /app/lib/
+    install -Dm644 -t /app/etc ld.so.conf
+    mkdir -p /app/links/lib
+    ln -srv /app/lib /app/links/lib/x86_64-linux-gnu
+    ln -srv /app/lib32 /app/links/lib/i386-linux-gnu
   sources:
-    - type: shell
-      commands:
-        - echo "/app/lib32" > ld.so.conf
+    - type: dir
+      path: .flatpak
 
 - name: game
   buildsystem: simple