diff --git a/app/arch/bzip2/ympbuild b/app/arch/bzip2/ympbuild index 6c709d2a..5b8c8b64 100644 --- a/app/arch/bzip2/ympbuild +++ b/app/arch/bzip2/ympbuild @@ -27,18 +27,18 @@ build(){ make -j$(nproc) -C $name-shared CFLAGS="-fpic -fPIC ${CFLAGS}" } package(){ - install -dm755 ${DESTDIR}/usr/{bin,lib64,include,share/man/man1} + install -dm755 ${DESTDIR}/usr/{bin,lib64/bzip2,include,share/man/man1} install -m755 $name-shared/bzip2-shared "${DESTDIR}"/usr/bin/bzip2 install -m755 bzip2recover bzdiff bzgrep bzmore "${DESTDIR}"/usr/bin ln -sf bzip2 "${DESTDIR}"/usr/bin/bunzip2 ln -sf bzip2 "${DESTDIR}"/usr/bin/bzcat - install -m755 libbz2.a "${DESTDIR}"/usr/lib64/ - install -m755 $name-shared/libbz2.so.${version} "${DESTDIR}"/usr/lib64 - ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so - ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so.1 - ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so.1.0 + install -m755 libbz2.a "${DESTDIR}"/usr/lib64/bzip2/ + install -m755 $name-shared/libbz2.so.${version} "${DESTDIR}"/usr/lib64/bzip2 + ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/bzip2/libbz2.so + ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/bzip2/libbz2.so.1 + ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/bzip2/libbz2.so.1.0 install -m644 bzlib.h "${DESTDIR}"/usr/include/ @@ -46,4 +46,5 @@ package(){ ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bunzip2.1 ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bzcat.1 ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bzip2recover.1 + echo "/usr/lib64/bzip2/" > ${DESTDIR}/etc/ld.so.conf.d/bzip2.conf } diff --git a/app/arch/libarchive/ympbuild b/app/arch/libarchive/ympbuild index aec0c1b9..293976a8 100644 --- a/app/arch/libarchive/ympbuild +++ b/app/arch/libarchive/ympbuild @@ -28,7 +28,7 @@ cd $name-$version setup() { ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/libarchive \ --enable-static \ --enable-shared \ --enable-xattr \ @@ -49,4 +49,5 @@ build() { } package() { make -j$(nproc) install + echo "/usr/lib64/libarchive/" > ${DESTDIR}/etc/ld.so.conf.d/libarchive.conf } diff --git a/app/arch/lz4/ympbuild b/app/arch/lz4/ympbuild index deff2dd8..347ae4d3 100644 --- a/app/arch/lz4/ympbuild +++ b/app/arch/lz4/ympbuild @@ -22,6 +22,8 @@ build(){ package(){ make install -j`nproc` PREFIX=/usr - mv ${DESTDIR}/usr/{lib,lib64} + mkdir -p ${DESTDIR}/usr/lib64 + mv ${DESTDIR}/usr/{lib,lib64/lz4} + echo "/usr/lib64/lz4/" > ${DESTDIR}/etc/ld.so.conf.d/lz4.conf } diff --git a/app/arch/lzo/ympbuild b/app/arch/lzo/ympbuild index a71813f8..78c3126c 100644 --- a/app/arch/lzo/ympbuild +++ b/app/arch/lzo/ympbuild @@ -18,7 +18,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/lzo } build(){ @@ -29,8 +29,9 @@ build(){ package(){ make install -j`nproc` - install -m 755 libminilzo.so.0 "${DESTDIR}"/usr/lib64 + install -m 755 libminilzo.so.0 "${DESTDIR}"/usr/lib64/lzo install -p -m 644 minilzo/minilzo.h ${DESTDIR}/usr/include/lzo - ln -s libminilzo.so.0 "${DESTDIR}"/usr/lib64/libminilzo.so + ln -s libminilzo.so.0 "${DESTDIR}"/usr/lib64/lzo/libminilzo.so + echo "/usr/lib64/lzo/" > ${DESTDIR}/etc/ld.so.conf.d/lzo.conf } diff --git a/app/arch/xz-utils/ympbuild b/app/arch/xz-utils/ympbuild index 8eed918e..4889b1e8 100644 --- a/app/arch/xz-utils/ympbuild +++ b/app/arch/xz-utils/ympbuild @@ -17,7 +17,7 @@ cd xz-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/xz-utils \ --enable-static \ --enable-shared \ $(use_opt doc --enable-doc --disable-doc) \ @@ -28,4 +28,5 @@ build(){ } package(){ make install -j$(nproc) + echo "/usr/lib64/xz-utils/" > ${DESTDIR}/etc/ld.so.conf.d/xz-utils.conf } diff --git a/app/misc/hello/ympbuild b/app/misc/hello/ympbuild index 1f6713a6..53e8af12 100644 --- a/app/misc/hello/ympbuild +++ b/app/misc/hello/ympbuild @@ -19,7 +19,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/hello } build(){ @@ -28,4 +28,5 @@ build(){ package(){ make install + echo "/usr/lib64/hello/" > ${DESTDIR}/etc/ld.so.conf.d/hello.conf } diff --git a/app/shell/bash/ympbuild b/app/shell/bash/ympbuild index fbb2fb48..77630878 100644 --- a/app/shell/bash/ympbuild +++ b/app/shell/bash/ympbuild @@ -19,7 +19,7 @@ setup(){ ./configure --prefix=/usr \ --libdir=/lib64 \ --bindir=/bin \ - --with-curses \ + --with-curses \ --enable-readline \ --without-bash-malloc } diff --git a/dev/db/sqlite/ympbuild b/dev/db/sqlite/ympbuild index fb059da7..e52e1be5 100644 --- a/dev/db/sqlite/ympbuild +++ b/dev/db/sqlite/ympbuild @@ -20,7 +20,7 @@ cd $name-autoconf-$srcver setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/sqlite \ --enable-fts3 \ --enable-fts4 \ --enable-fts5 \ @@ -40,5 +40,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/sqlite/" > ${DESTDIR}/etc/ld.so.conf.d/sqlite.conf } diff --git a/dev/libs/elfutils/ympbuild b/dev/libs/elfutils/ympbuild index 5d1457fd..0add0fc1 100644 --- a/dev/libs/elfutils/ympbuild +++ b/dev/libs/elfutils/ympbuild @@ -23,7 +23,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/elfutils \ --enable-shared \ --enable-static \ --disable-debuginfod \ @@ -43,5 +43,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/elfutils/" > ${DESTDIR}/etc/ld.so.conf.d/elfutils.conf } diff --git a/dev/libs/expat/ympbuild b/dev/libs/expat/ympbuild index c84233d3..07e233fc 100644 --- a/dev/libs/expat/ympbuild +++ b/dev/libs/expat/ympbuild @@ -19,7 +19,7 @@ cd $name-$version setup(){ cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib64 \ + -DCMAKE_INSTALL_LIBDIR=lib64/expat \ -DCMAKE_BUILD_TYPE=None \ -DEXPAT_BUILD_DOCS=false \ -W no-dev \ @@ -32,5 +32,6 @@ build(){ package(){ make install -C build + echo "/usr/lib64/expat/" > ${DESTDIR}/etc/ld.so.conf.d/expat.conf } diff --git a/dev/libs/glib/ympbuild b/dev/libs/glib/ympbuild index f7e7102d..9fea4e6b 100644 --- a/dev/libs/glib/ympbuild +++ b/dev/libs/glib/ympbuild @@ -20,7 +20,7 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/glib2.0 \ --default-library both \ -D glib_debug=disabled \ -D selinux=disabled \ @@ -35,5 +35,6 @@ package(){ ninja -C build install mkdir -p ${DESTDIR}/etc/sysconf.d/ install ../glib.sysconf ${DESTDIR}/etc/sysconf.d/glib + echo "/usr/lib64/glib2.0/" > ${DESTDIR}/etc/ld.so.conf.d/glib.conf } diff --git a/dev/libs/gmp/ympbuild b/dev/libs/gmp/ympbuild index f24220d8..7f0e18b4 100644 --- a/dev/libs/gmp/ympbuild +++ b/dev/libs/gmp/ympbuild @@ -18,7 +18,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/gmp \ $(use_opt cxx --enable-cxx --disable-cxx) } @@ -28,5 +28,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/gmp/" > ${DESTDIR}/etc/ld.so.conf.d/gmp.conf } diff --git a/dev/libs/libffi/ympbuild b/dev/libs/libffi/ympbuild index ab4fcc02..7dd026be 100644 --- a/dev/libs/libffi/ympbuild +++ b/dev/libs/libffi/ympbuild @@ -16,11 +16,12 @@ cd "$name-$version" setup(){ ./configure --prefix=/usr \ - --libdir=/lib64 + --libdir=/usr/lib64/libffi } build(){ make -j`nproc` } package(){ make -j`nproc` install + echo "/usr/lib64/libffi/" > ${DESTDIR}/etc/ld.so.conf.d/libffi.conf } diff --git a/dev/libs/libmpc/ympbuild b/dev/libs/libmpc/ympbuild index d7a8e64d..64ef6e4c 100644 --- a/dev/libs/libmpc/ympbuild +++ b/dev/libs/libmpc/ympbuild @@ -18,7 +18,7 @@ cd mpc-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/libmpc } build(){ @@ -27,5 +27,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/libmpc/" > ${DESTDIR}/etc/ld.so.conf.d/libmpc.conf } diff --git a/dev/libs/libpcre2/ympbuild b/dev/libs/libpcre2/ympbuild index d8e017ca..7e5e2cd1 100644 --- a/dev/libs/libpcre2/ympbuild +++ b/dev/libs/libpcre2/ympbuild @@ -19,7 +19,7 @@ cd pcre2-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/libpcre2 \ --enable-shared \ --enable-static \ $(use_opt zlib --enable-pcre2grep-libz --disable-pcre2grep-libz) \ @@ -32,5 +32,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/libpcre2/" > ${DESTDIR}/etc/ld.so.conf.d/libpcre2.conf } diff --git a/dev/libs/libtasn1/ympbuild b/dev/libs/libtasn1/ympbuild index d686d541..597a8082 100644 --- a/dev/libs/libtasn1/ympbuild +++ b/dev/libs/libtasn1/ympbuild @@ -16,11 +16,12 @@ cd "libtasn1-$version" setup(){ ./configure --prefix=/usr \ - --libdir=/lib64 + --libdir=/usr/lib64/libtasn1 } build(){ make -j`nproc` } package(){ make -j`nproc` install + echo "/usr/lib64/libtasn1/" > ${DESTDIR}/etc/ld.so.conf.d/libtasn1.conf } diff --git a/dev/libs/libunistring/ympbuild b/dev/libs/libunistring/ympbuild index 33dd339d..d1fc3906 100644 --- a/dev/libs/libunistring/ympbuild +++ b/dev/libs/libunistring/ympbuild @@ -18,7 +18,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/libunistring/ } build(){ @@ -27,7 +27,8 @@ build(){ package(){ make install -j`nproc` - ln -s libunistring.so ${DESTDIR}/usr/lib64/libunistring.so.2 - ln -s libunistring.so ${DESTDIR}/usr/lib64/libunistring.so.2.2.0 + ln -s libunistring.so ${DESTDIR}/usr/lib64/libunistring/libunistring.so.2 + ln -s libunistring.so ${DESTDIR}/usr/lib64/libunistring/libunistring.so.2.2.0 + echo "/usr/lib64/libunistring/" > ${DESTDIR}/etc/ld.so.conf.d/libunistring.conf } diff --git a/dev/libs/libxml2/ympbuild b/dev/libs/libxml2/ympbuild index feb33730..d0914046 100644 --- a/dev/libs/libxml2/ympbuild +++ b/dev/libs/libxml2/ympbuild @@ -24,7 +24,7 @@ setup(){ ./autogen.sh ./configure --prefix=/usr \ --with-history \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/libxml2 \ $(use_opt python --with-python --without-python) } @@ -38,5 +38,6 @@ package(){ mv ${DESTDIR}/usr/lib/* ${DESTDIR}/usr/lib64/ rmdir ${DESTDIR}/usr/lib/ fi + echo "/usr/lib64/libxml2/" > ${DESTDIR}/etc/ld.so.conf.d/libxml2.conf } diff --git a/dev/libs/mpfr/ympbuild b/dev/libs/mpfr/ympbuild index 2ce7ccf7..c514f705 100644 --- a/dev/libs/mpfr/ympbuild +++ b/dev/libs/mpfr/ympbuild @@ -18,7 +18,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/mpfr \ --enable-shared \ --enable-static \ --disable-maintainer-mode \ @@ -31,4 +31,5 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/mpfr/" > ${DESTDIR}/etc/ld.so.conf.d/mpfr.conf } diff --git a/dev/libs/nettle/ympbuild b/dev/libs/nettle/ympbuild index 42c46ea5..9ae77e6a 100644 --- a/dev/libs/nettle/ympbuild +++ b/dev/libs/nettle/ympbuild @@ -18,7 +18,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/nettle } build(){ @@ -27,5 +27,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/nettle/" > ${DESTDIR}/etc/ld.so.conf.d/nettle.conf } diff --git a/dev/libs/openssl/ympbuild b/dev/libs/openssl/ympbuild index 7e4a63f7..fda16d86 100644 --- a/dev/libs/openssl/ympbuild +++ b/dev/libs/openssl/ympbuild @@ -23,7 +23,7 @@ cd $name-$version setup(){ ./Configure --prefix=/usr \ --openssldir=/etc/ssl \ - --libdir=lib64 \ + --libdir=lib64/openssl \ shared linux-x86_64 } @@ -40,5 +40,6 @@ package(){ install_sw \ install_ssldirs \ install_man_docs -j`nproc` + echo "/usr/lib64/openssl/" > ${DESTDIR}/etc/ld.so.conf.d/openssl.conf } diff --git a/net/dns/libidn2/ympbuild b/net/dns/libidn2/ympbuild index d43d7775..729c1dda 100644 --- a/net/dns/libidn2/ympbuild +++ b/net/dns/libidn2/ympbuild @@ -18,7 +18,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/libidn2 } build(){ @@ -27,5 +27,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/libidn2/" > ${DESTDIR}/etc/ld.so.conf.d/libidn2.conf } diff --git a/net/libs/gnutls/ympbuild b/net/libs/gnutls/ympbuild index 1a443839..05bf2281 100644 --- a/net/libs/gnutls/ympbuild +++ b/net/libs/gnutls/ympbuild @@ -24,7 +24,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/gnutls \ --disable-guile \ --enable-ssl3-support \ --enable-openssl-compatibility \ @@ -41,5 +41,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/gnutls/" > ${DESTDIR}/etc/ld.so.conf.d/gnutls.conf } diff --git a/net/libs/libnghttp2/ympbuild b/net/libs/libnghttp2/ympbuild index b1178558..533f7609 100644 --- a/net/libs/libnghttp2/ympbuild +++ b/net/libs/libnghttp2/ympbuild @@ -20,7 +20,7 @@ cd nghttp2-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/libnghttp2 \ --without-neverbleed \ --without-jemalloc \ --disable-examples \ @@ -35,5 +35,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/libnghttp2/" > ${DESTDIR}/etc/ld.so.conf.d/libnghttp2.conf } diff --git a/net/libs/libnsl/ympbuild b/net/libs/libnsl/ympbuild index 76a728e6..8d15f3c8 100644 --- a/net/libs/libnsl/ympbuild +++ b/net/libs/libnsl/ympbuild @@ -19,7 +19,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/libnsl } build(){ @@ -28,5 +28,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/libnsl/" > ${DESTDIR}/etc/ld.so.conf.d/libnsl.conf } diff --git a/net/libs/libpsl/ympbuild b/net/libs/libpsl/ympbuild index 86ae6b5e..0533208e 100644 --- a/net/libs/libpsl/ympbuild +++ b/net/libs/libpsl/ympbuild @@ -18,7 +18,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/libpsl } build(){ @@ -27,5 +27,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/libpsl/" > ${DESTDIR}/etc/ld.so.conf.d/libpsl.conf } diff --git a/net/libs/libseccomp/ympbuild b/net/libs/libseccomp/ympbuild index 58a05a5c..564e2791 100644 --- a/net/libs/libseccomp/ympbuild +++ b/net/libs/libseccomp/ympbuild @@ -15,7 +15,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/libseccomp \ --enable-static \ --enable-shared \ --disable-silent-rules \ @@ -27,4 +27,5 @@ build(){ } package(){ make install -j$(nproc) + echo "/usr/lib64/libseccomp/" > ${DESTDIR}/etc/ld.so.conf.d/libseccomp.conf } diff --git a/net/libs/libssh/ympbuild b/net/libs/libssh/ympbuild index 9ff0bf80..24f994cb 100644 --- a/net/libs/libssh/ympbuild +++ b/net/libs/libssh/ympbuild @@ -19,7 +19,7 @@ zlib_depends=(zlib) setup() { cmake -S $name-$version -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib64 \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib64/libssh \ -DWITH_EXAMPLES=NO \ -DBUILD_SHARED_LIBS=YES \ -DBUILD_STATIC_LIB=YES \ @@ -37,5 +37,6 @@ build() { } package() { make -C build install - install build/src/libssh.a ${DESTDIR}/usr/lib64/ + install build/src/libssh.a ${DESTDIR}/usr/lib64/libssh/ + echo "/usr/lib64/libssh/" > ${DESTDIR}/etc/ld.so.conf.d/libssh.conf } diff --git a/net/libs/libtirpc/ympbuild b/net/libs/libtirpc/ympbuild index d8c0594c..deca0fa2 100644 --- a/net/libs/libtirpc/ympbuild +++ b/net/libs/libtirpc/ympbuild @@ -19,7 +19,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/libtirpc \ --disable-gssapi } @@ -29,5 +29,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/libtirpc/" > ${DESTDIR}/etc/ld.so.conf.d/libtirpc.conf } diff --git a/net/misc/curl/ympbuild b/net/misc/curl/ympbuild index 474e5d15..0ed4a610 100644 --- a/net/misc/curl/ympbuild +++ b/net/misc/curl/ympbuild @@ -36,7 +36,7 @@ prepare(){ setup(){ opts=( --prefix=/usr - --libdir=/usr/lib64 + --libdir=/usr/lib64/curl --disable-ldap --disable-ldaps --disable-versioned-symbols @@ -72,19 +72,20 @@ package(){ if use gnutls ; then cd ../curl-gnutls make install -j`nproc` - mv "${DESTDIR}"/usr/lib64/libcurl{,-gnutls}.so.4.8.0 - mv "${DESTDIR}"/usr/lib64/libcurl{,-gnutls}.a - mv "${DESTDIR}"/usr/lib64/pkgconfig/libcurl{,-gnutls}.pc + mv "${DESTDIR}"/usr/lib64/curl/libcurl{,-gnutls}.so.4.8.0 + mv "${DESTDIR}"/usr/lib64/curl/libcurl{,-gnutls}.a + mv "${DESTDIR}"/usr/lib64/curl/pkgconfig/libcurl{,-gnutls}.pc sed -i "s/-lcurl/-lcurl-gnutls/g" "${DESTDIR}"/usr/lib64/pkgconfig/libcurl-gnutls.pc - ln -s libcurl-gnutls.so.4 "${DESTDIR}"/usr/lib64/libcurl-gnutls.so + ln -s libcurl-gnutls.so.4 "${DESTDIR}"/usr/lib64/curl/libcurl-gnutls.so for ver in 3 4 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do - ln -s libcurl-gnutls.so.4.8.0 "${DESTDIR}"/usr/lib64/libcurl-gnutls.so.${ver} + ln -s libcurl-gnutls.so.4.8.0 "${DESTDIR}"/usr/lib64/curl/libcurl-gnutls.so.${ver} done fi cd ../$name-$version make install -j`nproc` for ver in 3 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do - ln -s libcurl.so.4.8.0 "${DESTDIR}"/usr/lib64/libcurl.so.${ver} + ln -s libcurl.so.4.8.0 "${DESTDIR}"/usr/lib64/curl/libcurl.so.${ver} done + echo "/usr/lib64/curl/" > ${DESTDIR}/etc/ld.so.conf.d/curl.conf } diff --git a/sys/apps/acl/ympbuild b/sys/apps/acl/ympbuild index 0d9b4228..2a82f1bb 100644 --- a/sys/apps/acl/ympbuild +++ b/sys/apps/acl/ympbuild @@ -18,7 +18,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/acl } build(){ @@ -27,4 +27,5 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/acl/" > ${DESTDIR}/etc/ld.so.conf.d/acl.conf } diff --git a/sys/apps/attr/ympbuild b/sys/apps/attr/ympbuild index c4eb6b49..8f660efa 100644 --- a/sys/apps/attr/ympbuild +++ b/sys/apps/attr/ympbuild @@ -18,7 +18,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/attr } build(){ @@ -27,5 +27,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/attr/" > ${DESTDIR}/etc/ld.so.conf.d/attr.conf } diff --git a/sys/apps/file/ympbuild b/sys/apps/file/ympbuild index 14980515..96edccf0 100644 --- a/sys/apps/file/ympbuild +++ b/sys/apps/file/ympbuild @@ -22,7 +22,7 @@ cd $name-$version setup(){ opts=( --prefix=/usr - --libdir=/usr/lib64 + --libdir=/usr/lib64/magic --enable-static --enable-elf --enable-elf-core @@ -40,4 +40,5 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/magic/" > ${DESTDIR}/etc/ld.so.conf.d/magic.conf } diff --git a/sys/apps/util-linux/ympbuild b/sys/apps/util-linux/ympbuild index fcf5cc73..8a2bdf7a 100644 --- a/sys/apps/util-linux/ympbuild +++ b/sys/apps/util-linux/ympbuild @@ -20,7 +20,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/util-linux \ --bindir=/usr/bin \ --enable-shared \ --enable-static \ @@ -47,5 +47,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/util-linux/" > ${DESTDIR}/etc/ld.so.conf.d/util-linux.conf } diff --git a/sys/apps/ymp/ympbuild b/sys/apps/ymp/ympbuild index 6a802afe..026c9570 100644 --- a/sys/apps/ymp/ympbuild +++ b/sys/apps/ymp/ympbuild @@ -21,7 +21,7 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ - --libdir=/lib64 \ + --libdir=/lib64/ymp \ --bindir=/bin \ -Dshared=true \ -Dstatic=false \ @@ -37,5 +37,6 @@ build(){ package(){ ninja -C build install + echo "/lib64/ymp/" > ${DESTDIR}/etc/ld.so.conf.d/ymp.conf } diff --git a/sys/devel/binutils/ympbuild b/sys/devel/binutils/ympbuild index 1cba478d..05b64c27 100644 --- a/sys/devel/binutils/ympbuild +++ b/sys/devel/binutils/ympbuild @@ -23,7 +23,7 @@ setup(){ mkdir build cd build ../configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/binutils \ --disable-nls \ --disable-werror \ --enable-cet \ @@ -55,5 +55,6 @@ build(){ package(){ cd build make install -j`nproc` + echo "/usr/lib64/binutils/" > ${DESTDIR}/etc/ld.so.conf.d/binutils.conf } diff --git a/sys/devel/gettext/ympbuild b/sys/devel/gettext/ympbuild index 5c4093ce..26ce969a 100644 --- a/sys/devel/gettext/ympbuild +++ b/sys/devel/gettext/ympbuild @@ -20,7 +20,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/lib64/gettext \ --enable-shared \ --enable-static \ --disable-java \ @@ -39,5 +39,6 @@ build(){ package(){ make install -j`nproc` + echo "/lib64/gettext/" > ${DESTDIR}/etc/ld.so.conf.d/gettext.conf } diff --git a/sys/devel/libtool/ympbuild b/sys/devel/libtool/ympbuild index ddea77a6..18a657f4 100644 --- a/sys/devel/libtool/ympbuild +++ b/sys/devel/libtool/ympbuild @@ -19,7 +19,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 + --libdir=/usr/lib64/libtool } build(){ @@ -28,5 +28,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/libtool/" > ${DESTDIR}/etc/ld.so.conf.d/libtool.conf } diff --git a/sys/libs/gdbm/ympbuild b/sys/libs/gdbm/ympbuild index 2ce05679..46cc9591 100644 --- a/sys/libs/gdbm/ympbuild +++ b/sys/libs/gdbm/ympbuild @@ -19,7 +19,7 @@ cd $name-$version setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/gdbm \ --enable-libgdbm-compat } @@ -29,5 +29,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/gdbm/" > ${DESTDIR}/etc/ld.so.conf.d/gdbm.conf } diff --git a/sys/libs/libcap-ng/ympbuild b/sys/libs/libcap-ng/ympbuild index 97564a06..79dce564 100644 --- a/sys/libs/libcap-ng/ympbuild +++ b/sys/libs/libcap-ng/ympbuild @@ -22,7 +22,7 @@ cd $name-$version setup(){ ./autogen.sh ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/libcap-ng \ $(use_opt python --with-python --without-python) \ $(use_opt python --with-python3 --without-python3) } @@ -33,5 +33,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/libcap-ng/" > ${DESTDIR}/etc/ld.so.conf.d/libcap-ng.conf } diff --git a/sys/libs/libcap/ympbuild b/sys/libs/libcap/ympbuild index 9baeaf5b..fde51805 100644 --- a/sys/libs/libcap/ympbuild +++ b/sys/libs/libcap/ympbuild @@ -18,10 +18,11 @@ arch=('x86_64') cd $name-$version build(){ - make DYNAMIC=yes KERNEL_HEADERS=/usr/include lib=lib64 prefix=/usr + make DYNAMIC=yes KERNEL_HEADERS=/usr/include lib=lib64/libcap prefix=/usr } package(){ - make RAISE_SETFCAP=no lib=lib64 prefix=/usr install + make RAISE_SETFCAP=no lib=lib64/libcap prefix=/usr install + echo "/usr/lib64/libcap/" > ${DESTDIR}/etc/ld.so.conf.d/libcap.conf } diff --git a/sys/libs/libxcrypt/ympbuild b/sys/libs/libxcrypt/ympbuild index 3a51ef0e..4a505c6e 100644 --- a/sys/libs/libxcrypt/ympbuild +++ b/sys/libs/libxcrypt/ympbuild @@ -25,12 +25,12 @@ prepare(){ setup(){ ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/libxcrypt \ --enable-hashes=strong,glibc \ --enable-obsolete-api=glibc cd ../$name-compat ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/libxcrypt \ --enable-hashes=strong,glibc \ --enable-obsolete-api=no } @@ -45,6 +45,7 @@ package(){ make install -j`nproc` cd ../$name-compat make install -j`nproc` + echo "/usr/lib64/libxcrypt/" > ${DESTDIR}/etc/ld.so.conf.d/libxcrypt.conf } diff --git a/sys/libs/pam/ympbuild b/sys/libs/pam/ympbuild index 043d0b4b..0fa2a35a 100644 --- a/sys/libs/pam/ympbuild +++ b/sys/libs/pam/ympbuild @@ -20,7 +20,7 @@ cd Linux-PAM-$version setup(){ ./configure --prefix=/usr \ --sbindir=/sbin \ - --libdir=/lib64/pam \ + --libdir=/lib64 \ --enable-securedir=/lib64/security \ --enable-static \ --enable-shared \ @@ -38,7 +38,6 @@ package(){ rm -rf ${DESTDIR}/usr/lib/systemd/ # ld.so.conf mkdir -p ${DESTDIR}/etc/ld.so.conf.d/ - echo "/lib64/pam/" > ${DESTDIR}/etc/ld.so.conf.d/pam.conf mv ${DESTDIR}/lib64/pam/pkgconfig ${DESTDIR}/lib64/pkgconfig } diff --git a/sys/process/audit/ympbuild b/sys/process/audit/ympbuild index 592c5d74..a3d41376 100644 --- a/sys/process/audit/ympbuild +++ b/sys/process/audit/ympbuild @@ -22,7 +22,7 @@ cd audit-userspace-$version setup(){ autoreconf -fv --install ./configure --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib64/audit \ --disable-zos-remote \ --disable-listener \ --disable-systemd \ @@ -38,5 +38,6 @@ build(){ package(){ make install -j`nproc` + echo "/usr/lib64/audit/" > ${DESTDIR}/etc/ld.so.conf.d/audit.conf }