diff --git a/base-files/ympbuild b/base-files/ympbuild index ef9ba980..aea2a94c 100644 --- a/base-files/ympbuild +++ b/base-files/ympbuild @@ -8,7 +8,7 @@ email='parduscix@yandex.ru' maintainer='sulincix' license=('GPLv3') source=("https://gitlab.com/sulix/devel/sources/base-files/-/archive/$version/base-files-$version.zip") -md5sums=('8c5ac1d616fa78db004c2e8fb419a27c') +md5sums=('009efca6fc8897379ac844b786bfb585') arch=(x86_64) if [[ -d "$name-$version" ]] ; then diff --git a/glibc/ympbuild b/glibc/ympbuild index debbd418..5960b233 100644 --- a/glibc/ympbuild +++ b/glibc/ympbuild @@ -26,7 +26,6 @@ export CXXFLAGS="-O3 ${debug:+-g} -s -mno-tls-direct-seg-refs -mtune=generic -DS export CC=gcc export CXX=g++ - cd "$name-$version" setup(){ opts=( @@ -64,7 +63,11 @@ setup(){ cd .. } build(){ - for bdir in glibc32-build glibc-build ; do + bdirs=(glibc-build) + if use multilib ; then + bdirs+=(glibc32-build) + fi + for bdir in ${bdirs[@]} ; do if [[ -d $bdir ]] ; then cd $bdir make -O -j`nproc --all` @@ -77,8 +80,13 @@ package(){ # create symlink lib64 (gentoo compability) mkdir -p ${DESTDIR}/lib64 ln -s lib64 ${DESTDIR}/lib - ln -s lib32 ${DESTDIR}/libx32 - for bdir in glibc32-build glibc-build ; do + bdirs=(glibc-build) + if use multilib ; then + mkdir -p ${DESTDIR}/lib32 + ln -s lib32 ${DESTDIR}/libx32 + bdirs+=(glibc32-build) + fi + for bdir in ${bdirs[@]} ; do if [[ -d $bdir ]] ; then # install files cd $bdir