diff --git a/system/base/base-files/base-files.sysconf b/system/base/base-files/base-files.sysconf index b0febad7..463f473c 100644 --- a/system/base/base-files/base-files.sysconf +++ b/system/base/base-files/base-files.sysconf @@ -6,6 +6,7 @@ if [ ! -f /var/lib/ymp/sysconf/base-files/postinstall.done ]; then mkdir -p /kernel/modules mkdir -p /kernel/firmware mkdir -p /usr/lib64 + mkdir -p /usr/lib32 chown root /data/user/root chmod 700 /data/user/root ln -s data/user/root /root @@ -15,7 +16,8 @@ if [ ! -f /var/lib/ymp/sysconf/base-files/postinstall.done ]; then ln -s ../data/log /var/log ln -s ../kernel/modules /lib/modules ln -s ../kernel/firmware /lib/firmare - ln -s ../lib64 /usr/lib + ln -s ./lib64 /usr/lib + ln -s ./lib32 /usr/libx32 date > /var/lib/ymp/sysconf/base-files/postinstall.done touch /etc/passwd fi diff --git a/system/extra/nghttp2/ympbuild b/system/extra/nghttp2/ympbuild index 93627e51..d5c880a3 100644 --- a/system/extra/nghttp2/ympbuild +++ b/system/extra/nghttp2/ympbuild @@ -13,22 +13,20 @@ makedepends=( ) md5sums=('d8c534bbdd84297afa4f6576896a3d76') arch=('x86_64') group=(system.extra python) -uses=(libxml2 python) +uses=(libxml2) libxml2_depends=(libxml2) -python_depends=(python) cd $name-$version setup(){ ./configure --prefix=/usr \ --libdir=/usr/lib64 \ - --without-neverbleed \ - --without-jemalloc \ - --disable-examples \ - --enable-static \ - --enable-app \ - $(use_opt libxml2 --with-libxml2 --without-libxml2) \ - $(use_opt python --enable-python-bindings --disable-python-bindings) + --without-neverbleed \ + --without-jemalloc \ + --disable-examples \ + --enable-static \ + --enable-lib-only\ + $(use_opt libxml2 --with-libxml2 --without-libxml2) } build(){ @@ -37,7 +35,5 @@ build(){ package(){ make install -j`nproc` - mv ${DESTDIR}/usr/lib/* ${DESTDIR}/usr/lib64/ - rmdir ${DESTDIR}/usr/lib/ }