diff --git a/system/base/glibc/glibc.sysconf b/system/base/glibc/glibc.sysconf index 4be8c583..9b45e25b 100644 --- a/system/base/glibc/glibc.sysconf +++ b/system/base/glibc/glibc.sysconf @@ -1,2 +1,6 @@ #!/bin/sh /sbin/ldconfig +/bin/busybox chmod +x -R /bin +/bin/busybox chmod +x -R /sbin +/bin/busybox chmod +x -R /usr/bin +/bin/busybox chmod +x -R /usr/sbin diff --git a/system/base/glibc/ld.so.conf b/system/base/glibc/ld.so.conf index 5aa55119..ccafc7e1 100644 --- a/system/base/glibc/ld.so.conf +++ b/system/base/glibc/ld.so.conf @@ -1,2 +1,5 @@ +/lib64/sulix +/lib32/sulix include ld.so.conf.d/*.conf -/lib/sulix +/lib64 +/lib32 diff --git a/system/base/glibc/locale-gen b/system/base/glibc/locale-gen index ee888807..c2298d00 100644 --- a/system/base/glibc/locale-gen +++ b/system/base/glibc/locale-gen @@ -13,7 +13,7 @@ fi # Remove all old locale dir and locale-archive before generating new # locale data. -rm -rf /usr/lib/locale/locale-archive || true +rm -rf /usr/lib64/locale/locale-archive || true umask 022 diff --git a/system/base/glibc/usr-support.conf b/system/base/glibc/usr-support.conf index 0e693877..68089d4a 100644 --- a/system/base/glibc/usr-support.conf +++ b/system/base/glibc/usr-support.conf @@ -1,4 +1,4 @@ -/usr/lib -/usr/local/lib /usr/local/lib64 /usr/lib64 +/usr/local/lib32 +/usr/lib32 diff --git a/system/base/glibc/x86_64-linux-gnu.conf b/system/base/glibc/x86_64-linux-gnu.conf index 9948896b..971b267b 100644 --- a/system/base/glibc/x86_64-linux-gnu.conf +++ b/system/base/glibc/x86_64-linux-gnu.conf @@ -1,4 +1,8 @@ -# Multiarch support +# Debian compability support /usr/local/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu -/usr/lib/x86_64-linux-gnu \ No newline at end of file +/usr/lib/x86_64-linux-gnu +# Debian compability support +/usr/local/lib/i386-linux-gnu +/lib/i386-linux-gnu +/usr/lib/i386-linux-gnu diff --git a/system/base/glibc/ympbuild b/system/base/glibc/ympbuild index 8c6097bf..e234364d 100644 --- a/system/base/glibc/ympbuild +++ b/system/base/glibc/ympbuild @@ -36,12 +36,13 @@ setup(){ patch -Np1 -i "../reenable_DT_HASH.patch" opts=( --prefix=/usr - --mandir=/share/man - --infodir=/share/info + --mandir=/usr/share/man + --infodir=/usr/share/info --with-bugurl=http://gitlab.com/sulix/main/issues --enable-add-ons --enable-bind-now --enable-lock-elision + --enable-cet --enable-multi-arch --enable-static-pie --enable-stack-protector=all @@ -71,6 +72,7 @@ setup(){ echo "slibdir=/lib64" >> configparms echo "rtlddir=/lib64" >> configparms ../configure ${opts[@]} \ + --host=x86_64-pc-linux-gnu \ --libdir=/lib64 \ --libexecdir=/lib64/glibc cd ..