clearlinux/linux-steam-integration
2
0
Fork 0
mirror of https://github.com/clearlinux/linux-steam-integration.git synced 2026-09-06 22:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore option for controlling libcxx abi for LD_PRELOAD, fixes steam runtime

Browse Source 
Signed-off-by: Ikey Doherty <ikey@solus-project.com>
This commit is contained in:
Ikey Doherty
2017-10-11 01:28:48 +01:00
parent 7d0acc9891
commit 75d2e9cc45
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+5
View File
@@ -70,6 +70,11 @@ There are a number of meson configure options you should be aware of when integr
/usr/\$LIB/libX11.so.6:/usr/\$LIB/libstdc++.so.6
`-Dwith-new-libcxx-abi=$boolean`
Enable this if your distribution uses a recent libstdc++ build, from
GCC 6 or higher.
`-Dwith-frontend=$boolean`
A small UI application is shipped to enable configuration of LSI, which presents
meson.build
+4
View File
@@ -60,6 +60,10 @@ endif
with_frontend = get_option('with-frontend')
if get_option('with-new-libcxx-abi') == true
cdata.set('LSI_USE_NEW_ABI', '1')
endif
config_h = configure_file(
configuration: cdata,
output: 'config.h',
meson_options.txt
+1
View File
@@ -5,3 +5,4 @@ option('with-frontend', type: 'boolean', description: 'Build the LSI Settings UI
option('with-preload-libs', type: 'string', description: 'Colon separated list of libraries required to launch Steam games',
value: '/usr/\$LIB/libxcb.so.1:/usr/\$LIB/libX11.so.6:/usr/\$LIB/libstdc++.so.6')
option('with-libintercept', type: 'boolean', description: 'Enable libintercept library for controlling Steam linking', value: true)
option('with-new-libcxx-abi', type: 'boolean', description: 'Enable when using the new libstdc++ ABI', value: false)
mkgobuildy.sh
+2 -2
View File
@@ -2,11 +2,11 @@
set -e
if [[ ! -d buildroot/build32 ]]; then
CC="gcc -m32" linux32 meson buildroot/build32 --prefix=/usr --sysconfdir=/etc --datadir=/usr/share --libdir=/usr/lib32 -Dwith-shim=none
CC="gcc -m32" linux32 meson buildroot/build32 --prefix=/usr --sysconfdir=/etc --datadir=/usr/share --libdir=/usr/lib32 -Dwith-shim=none -Dwith-new-libcxx-abi=true
fi
if [[ ! -d buildroot/build64 ]]; then
meson buildroot/build64 --prefix=/usr --sysconfdir=/etc --datadir=/usr/share --libdir=/usr/lib64 -Dwith-shim=replacement -Dwith-steam-binary=/usr/lib64/steam/steam -Dwith-frontend=true
meson buildroot/build64 --prefix=/usr --sysconfdir=/etc --datadir=/usr/share --libdir=/usr/lib64 -Dwith-shim=replacement -Dwith-steam-binary=/usr/lib64/steam/steam -Dwith-frontend=true -Dwith-new-libcxx-abi=true
fi
ninja -C buildroot/build32