Skip to content
Snippets Groups Projects
Commit 6ce0371a authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/t20117' into 'master'

Fix soldier/heavy SDK build after !9

See merge request steam/flatdeb-steam!11
parents d87bc51b 09aed06d
No related branches found
No related tags found
1 merge request!11Fix soldier/heavy SDK build after !9
......@@ -40,22 +40,27 @@ post_script: |
# need to use the host system glibc when pressure-vessel brings in the
# host graphics drivers.
install -d -m755 /usr/lib32
ln -s ../lib/locale /usr/lib32/locale
ln -fnsv ../lib/locale /usr/lib32/locale
# Biarch OSs that are the other way round might conceivably look here
install -d -m755 /usr/lib64
ln -s ../lib/locale /usr/lib64/locale
ln -fnsv ../lib/locale /usr/lib64/locale
# Ensure that the libdrm folder is present
install -d -m755 /usr/share/libdrm
# Arch Linux uses a non-standard ELF interpreter for some binaries in the
# glibc package. We create two symlinks as a workaround.
ln -s /lib64/ld-linux-x86-64.so.2 /usr/lib/
# Few lines above we already ensured that /usr/lib32 exists
ln -s /lib/ld-linux.so.2 /usr/lib32/
ln -fnsv /lib64/ld-linux-x86-64.so.2 /usr/lib/
# Few lines above we already ensured that /usr/lib32 exists.
if [ -e /lib32/ld-linux.so.2 ]; then
# Create a symlink that the /usr merge will be able to merge
ln -fnsv /lib32/ld-linux.so.2 /usr/lib32/
else
ln -fnsv /lib/ld-linux.so.2 /usr/lib32/
fi
# Create symlinks to support the non-standard Exherbo library paths
install -d -m755 /usr/i686-pc-linux-gnu
install -d -m755 /usr/x86_64-pc-linux-gnu
ln -s /usr/lib/i386-linux-gnu /usr/i686-pc-linux-gnu/lib
ln -s /usr/lib/x86_64-linux-gnu /usr/x86_64-pc-linux-gnu/lib
ln -fnsv /usr/lib/i386-linux-gnu /usr/i686-pc-linux-gnu/lib
ln -fnsv /usr/lib/x86_64-linux-gnu /usr/x86_64-pc-linux-gnu/lib
# Ensure gconv directories. Previously we already ensured to have both
# /usr/lib32 and /usr/lib64. "/usr/(i686|x86_64)-pc-linux-gnu/lib" are
# symlinked to "/usr/lib/(i386|x86_64)-linux-gnu", so there is no need to
......
......@@ -47,22 +47,27 @@ post_script: |
# need to use the host system glibc when pressure-vessel brings in the
# host graphics drivers.
install -d -m755 /usr/lib32
ln -s ../lib/locale /usr/lib32/locale
ln -fnsv ../lib/locale /usr/lib32/locale
# Biarch OSs that are the other way round might conceivably look here
install -d -m755 /usr/lib64
ln -s ../lib/locale /usr/lib64/locale
ln -fnsv ../lib/locale /usr/lib64/locale
# Ensure that the libdrm folder is present
install -d -m755 /usr/share/libdrm
# Arch Linux uses a non-standard ELF interpreter for some binaries in the
# glibc package. We create two symlinks as a workaround.
ln -s /lib64/ld-linux-x86-64.so.2 /usr/lib/
# Few lines above we already ensured that /usr/lib32 exists
ln -s /lib/ld-linux.so.2 /usr/lib32/
ln -fnsv /lib64/ld-linux-x86-64.so.2 /usr/lib/
# Few lines above we already ensured that /usr/lib32 exists.
if [ -e /lib32/ld-linux.so.2 ]; then
# Create a symlink that the /usr merge will be able to merge
ln -fnsv /lib32/ld-linux.so.2 /usr/lib32/
else
ln -fnsv /lib/ld-linux.so.2 /usr/lib32/
fi
# Create symlinks to support the non-standard Exherbo library paths
install -d -m755 /usr/i686-pc-linux-gnu
install -d -m755 /usr/x86_64-pc-linux-gnu
ln -s /usr/lib/i386-linux-gnu /usr/i686-pc-linux-gnu/lib
ln -s /usr/lib/x86_64-linux-gnu /usr/x86_64-pc-linux-gnu/lib
ln -fnsv /usr/lib/i386-linux-gnu /usr/i686-pc-linux-gnu/lib
ln -fnsv /usr/lib/x86_64-linux-gnu /usr/x86_64-pc-linux-gnu/lib
# Ensure gconv directories. Previously we already ensured to have both
# /usr/lib32 and /usr/lib64. "/usr/(i686|x86_64)-pc-linux-gnu/lib" are
# symlinked to "/usr/lib/(i386|x86_64)-linux-gnu", so there is no need to
......
......@@ -44,22 +44,27 @@ post_script: |
# need to use the host system glibc when pressure-vessel brings in the
# host graphics drivers.
install -d -m755 /usr/lib32
ln -s ../lib/locale /usr/lib32/locale
ln -fnsv ../lib/locale /usr/lib32/locale
# Biarch OSs that are the other way round might conceivably look here
install -d -m755 /usr/lib64
ln -s ../lib/locale /usr/lib64/locale
ln -fnsv ../lib/locale /usr/lib64/locale
# Ensure that the libdrm folder is present
install -d -m755 /usr/share/libdrm
# Arch Linux uses a non-standard ELF interpreter for some binaries in the
# glibc package. We create two symlinks as a workaround.
ln -s /lib64/ld-linux-x86-64.so.2 /usr/lib/
# Few lines above we already ensured that /usr/lib32 exists
ln -s /lib/ld-linux.so.2 /usr/lib32/
ln -fnsv /lib64/ld-linux-x86-64.so.2 /usr/lib/
# Few lines above we already ensured that /usr/lib32 exists.
if [ -e /lib32/ld-linux.so.2 ]; then
# Create a symlink that the /usr merge will be able to merge
ln -fnsv /lib32/ld-linux.so.2 /usr/lib32/
else
ln -fnsv /lib/ld-linux.so.2 /usr/lib32/
fi
# Create symlinks to support the non-standard Exherbo library paths
install -d -m755 /usr/i686-pc-linux-gnu
install -d -m755 /usr/x86_64-pc-linux-gnu
ln -s /usr/lib/i386-linux-gnu /usr/i686-pc-linux-gnu/lib
ln -s /usr/lib/x86_64-linux-gnu /usr/x86_64-pc-linux-gnu/lib
ln -fnsv /usr/lib/i386-linux-gnu /usr/i686-pc-linux-gnu/lib
ln -fnsv /usr/lib/x86_64-linux-gnu /usr/x86_64-pc-linux-gnu/lib
# Ensure gconv directories. Previously we already ensured to have both
# /usr/lib32 and /usr/lib64. "/usr/(i686|x86_64)-pc-linux-gnu/lib" are
# symlinked to "/usr/lib/(i386|x86_64)-linux-gnu", so there is no need to
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment