From 956faa8468fe8ee7dddbe7a729d2c3e098192dd7 Mon Sep 17 00:00:00 2001 From: sulincix Date: Wed, 7 Dec 2022 18:29:51 +0000 Subject: [PATCH] ncurses fix --- sys/libs/ncurses/ympbuild | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/libs/ncurses/ympbuild b/sys/libs/ncurses/ympbuild index c7a52650..bf43da82 100644 --- a/sys/libs/ncurses/ympbuild +++ b/sys/libs/ncurses/ympbuild @@ -10,7 +10,7 @@ license=('MIT') arch=(x86_64) source=(https://invisible-mirror.net/archives/$name/$name-$version.tar.gz) md5sums=(a2736befde5fee7d2b7eb45eb281cdbe) -depends=(glibc) +depends=() so_ver=6 group=(sys.libs) @@ -20,7 +20,6 @@ setup(){ cp -prf ../$name-$version ../widec opts=(--prefix=/usr --libdir=/lib64 - --with-pkg-config-libdir=/lib64/pkgconfig --without-ada --without-tests --disable-termcap @@ -45,27 +44,27 @@ build(){ } package(){ - mkdir -p "$DESTDIR/lib64/ncurses/" "$DESTDIR/usr/lib64/pkgconfig/" + mkdir -p "$DESTDIR/lib64/" "$DESTDIR/usr/lib64/pkgconfig/" for lib in ncurses ncurses++ form panel menu; do - printf "INPUT(-l%sw)\n" "${lib}" > "$DESTDIR/lib64/ncurses/lib${lib}.so" + printf "INPUT(-l%sw)\n" "${lib}" > "$DESTDIR/lib64/lib${lib}.so" ln -sv ${lib}w.pc "$DESTDIR/usr/lib64/pkgconfig/${lib}.pc" done # some packages look for -lcurses during build - printf 'INPUT(-lncursesw)\n' > "$DESTDIR/lib64/ncurses/libcursesw.so" - ln -sv libncurses.so "$DESTDIR/lib64/ncurses/libcurses.so" + printf 'INPUT(-lncursesw)\n' > "$DESTDIR/lib64/libcursesw.so" + ln -sv libncurses.so "$DESTDIR/lib64/libcurses.so" # tic and ticinfo functionality is built in by default # make sure that anything linking against it links against libncursesw.so instead for lib in tic tinfo; do - printf "INPUT(libncursesw.so.%s)\n" "${so_ver}" > "$DESTDIR/lib64/ncurses/lib${lib}.so" - if ! ls $DESTDIR/lib64/ncurses/lib${lib}.so.${so_ver} ; then - ln -sv libncursesw.so.${so_ver} "$DESTDIR/lib64/ncurses/lib${lib}.so.${so_ver}" + printf "INPUT(libncursesw.so.%s)\n" "${so_ver}" > "$DESTDIR/lib64/lib${lib}.so" + if ! ls $DESTDIR/lib64/lib${lib}.so.${so_ver} ; then + ln -sv libncursesw.so.${so_ver} "$DESTDIR/lib64/lib${lib}.so.${so_ver}" ln -sv ncursesw.pc "$DESTDIR/usr/lib64/pkgconfig/${lib}.pc" fi done # legacy binary support for lib in libncursesw libncurses libtinfo libpanelw libformw libmenuw ; do - ln -sv ${lib}.so.${so_ver} "$DESTDIR"/lib64/ncurses/${lib}.so.5 + ln -sv ${lib}.so.${so_ver} "$DESTDIR"/lib64/${lib}.so.5 done cd ../widec make -j$(nproc) install