commit ace38a1781a18c42007cb381e81f83446a9ad804 Author: Juergen Daubert <jue@jue.li> Date: Wed Sep 9 12:44:42 2015 +0200 ncurses: build only the wide library and fix library symlinks (FS#1210) our old port for ncurses was somewhat broken and ldconfig creates two additional symlinks - /usr/lib/libncurses.so.5 - /usr/lib/libncursesw.so.5 Because of this we have to force-install the new port! diff --git a/ncurses/.footprint b/ncurses/.footprint index 1c4d37b..e87627f 100644 --- a/ncurses/.footprint +++ b/ncurses/.footprint @@ -1,6 +1,5 @@ drwxr-xr-x root/root lib/ -lrwxrwxrwx root/root lib/libncurses.so.6 -> libncurses.so.6.0 --rwxr-xr-x root/root lib/libncurses.so.6.0 +lrwxrwxrwx root/root lib/libncurses.so.6 -> libncursesw.so.6.0 lrwxrwxrwx root/root lib/libncursesw.so.6 -> libncursesw.so.6.0 -rwxr-xr-x root/root lib/libncursesw.so.6.0 drwxr-xr-x root/root usr/ @@ -9,7 +8,6 @@ lrwxrwxrwx root/root usr/bin/captoinfo -> tic -rwxr-xr-x root/root usr/bin/clear -rwxr-xr-x root/root usr/bin/infocmp lrwxrwxrwx root/root usr/bin/infotocap -> tic --rwxr-xr-x root/root usr/bin/ncurses6-config -rwxr-xr-x root/root usr/bin/ncursesw6-config lrwxrwxrwx root/root usr/bin/reset -> tset -rwxr-xr-x root/root usr/bin/tabs @@ -41,39 +39,39 @@ lrwxrwxrwx root/root usr/include/ncursesw/ncurses.h -> ../curses.h -rw-r--r-- root/root usr/include/tic.h -rw-r--r-- root/root usr/include/unctrl.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libcurses.a -> libncurses.a lrwxrwxrwx root/root usr/lib/libcurses.so -> libncurses.so -lrwxrwxrwx root/root usr/lib/libcursesw.so -> libncursesw.so --rw-r--r-- root/root usr/lib/libform.a -lrwxrwxrwx root/root usr/lib/libform.so -> libform.so.6 -lrwxrwxrwx root/root usr/lib/libform.so.6 -> libform.so.6.0 --rwxr-xr-x root/root usr/lib/libform.so.6.0 +-rw-r--r-- root/root usr/lib/libcursesw.so +-rw-r--r-- root/root usr/lib/libform.so -rw-r--r-- root/root usr/lib/libformw.a lrwxrwxrwx root/root usr/lib/libformw.so -> libformw.so.6 lrwxrwxrwx root/root usr/lib/libformw.so.6 -> libformw.so.6.0 -rwxr-xr-x root/root usr/lib/libformw.so.6.0 --rw-r--r-- root/root usr/lib/libmenu.a -lrwxrwxrwx root/root usr/lib/libmenu.so -> libmenu.so.6 -lrwxrwxrwx root/root usr/lib/libmenu.so.6 -> libmenu.so.6.0 --rwxr-xr-x root/root usr/lib/libmenu.so.6.0 +-rw-r--r-- root/root usr/lib/libmenu.so -rw-r--r-- root/root usr/lib/libmenuw.a lrwxrwxrwx root/root usr/lib/libmenuw.so -> libmenuw.so.6 lrwxrwxrwx root/root usr/lib/libmenuw.so.6 -> libmenuw.so.6.0 -rwxr-xr-x root/root usr/lib/libmenuw.so.6.0 --rw-r--r-- root/root usr/lib/libncurses++.a -rw-r--r-- root/root usr/lib/libncurses++w.a --rw-r--r-- root/root usr/lib/libncurses.a -lrwxrwxrwx root/root usr/lib/libncurses.so -> ../../lib/libncurses.so.6.0 +-rw-r--r-- root/root usr/lib/libncurses.so +lrwxrwxrwx root/root usr/lib/libncurses.so.5 -> libncursesw.so -rw-r--r-- root/root usr/lib/libncursesw.a lrwxrwxrwx root/root usr/lib/libncursesw.so -> ../../lib/libncursesw.so.6.0 --rw-r--r-- root/root usr/lib/libpanel.a -lrwxrwxrwx root/root usr/lib/libpanel.so -> libpanel.so.6 -lrwxrwxrwx root/root usr/lib/libpanel.so.6 -> libpanel.so.6.0 --rwxr-xr-x root/root usr/lib/libpanel.so.6.0 +lrwxrwxrwx root/root usr/lib/libncursesw.so.5 -> libncursesw.so +-rw-r--r-- root/root usr/lib/libpanel.so -rw-r--r-- root/root usr/lib/libpanelw.a lrwxrwxrwx root/root usr/lib/libpanelw.so -> libpanelw.so.6 lrwxrwxrwx root/root usr/lib/libpanelw.so.6 -> libpanelw.so.6.0 -rwxr-xr-x root/root usr/lib/libpanelw.so.6.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +lrwxrwxrwx root/root usr/lib/pkgconfig/form.pc -> formw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/formw.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/menu.pc -> menuw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/menuw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/ncurses++w.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/ncurses.pc -> ncursesw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/ncursesw.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/panel.pc -> panelw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/panelw.pc lrwxrwxrwx root/root usr/lib/terminfo -> ../share/terminfo drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ @@ -82,7 +80,6 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/clear.1.gz -rw-r--r-- root/root usr/share/man/man1/infocmp.1m.gz -rw-r--r-- root/root usr/share/man/man1/infotocap.1m.gz --rw-r--r-- root/root usr/share/man/man1/ncurses6-config.1.gz -rw-r--r-- root/root usr/share/man/man1/ncursesw6-config.1.gz lrwxrwxrwx root/root usr/share/man/man1/reset.1.gz -> tset.1.gz -rw-r--r-- root/root usr/share/man/man1/tabs.1.gz @@ -949,17 +946,6 @@ drwxr-xr-x root/root usr/share/man/man5/ -rw-r--r-- root/root usr/share/man/man5/terminfo.5.gz drwxr-xr-x root/root usr/share/man/man7/ -rw-r--r-- root/root usr/share/man/man7/term.7.gz -drwxr-xr-x root/root usr/share/pkgconfig/ --rw-r--r-- root/root usr/share/pkgconfig/form.pc --rw-r--r-- root/root usr/share/pkgconfig/formw.pc --rw-r--r-- root/root usr/share/pkgconfig/menu.pc --rw-r--r-- root/root usr/share/pkgconfig/menuw.pc --rw-r--r-- root/root usr/share/pkgconfig/ncurses++.pc --rw-r--r-- root/root usr/share/pkgconfig/ncurses++w.pc --rw-r--r-- root/root usr/share/pkgconfig/ncurses.pc --rw-r--r-- root/root usr/share/pkgconfig/ncursesw.pc --rw-r--r-- root/root usr/share/pkgconfig/panel.pc --rw-r--r-- root/root usr/share/pkgconfig/panelw.pc drwxr-xr-x root/root usr/share/tabset/ -rw-r--r-- root/root usr/share/tabset/std -rw-r--r-- root/root usr/share/tabset/stdcrt diff --git a/ncurses/Pkgfile b/ncurses/Pkgfile index e253481..90f5ad8 100644 --- a/ncurses/Pkgfile +++ b/ncurses/Pkgfile @@ -4,40 +4,44 @@ name=ncurses version=6.0 -release=1 +release=2 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) build() { cd $name-$version - local OPTIONS=" ---with-install-prefix=$PKG ---prefix=/usr ---mandir=/usr/share/man ---with-normal ---with-shared ---without-debug ---without-ada ---without-tests ---enable-pc-files -" - - ./configure $OPTIONS - make - make install - make distclean + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --with-{normal,shared} \ + --without-{debug,ada,tests} \ + --enable-pc-files \ + --with-pkg-config-libdir=/usr/lib/pkgconfig \ + --enable-widec - ./configure $OPTIONS --enable-widec make - make install + make DESTDIR=$PKG install install -d $PKG/{lib,usr/include/ncursesw} - for i in w ''; do - mv $PKG/usr/lib/libncurses$i.so.* $PKG/lib - ln -sf libncurses$i.so $PKG/usr/lib/libcurses$i.so - ln -sf ../../lib/libncurses$i.so.$version $PKG/usr/lib/libncurses$i.so + # move library to /lib and create symlinks + mv $PKG/usr/lib/libncursesw.so.* $PKG/lib + ln -sf ../../lib/libncursesw.so.$version $PKG/usr/lib/libncursesw.so + ln -s libncursesw.so.$version $PKG/lib/libncurses.so.${version%%.*} + + # linker scripts and .pc files for non-wide ncurses + for LIB in ncurses form panel menu ; do + echo "INPUT(-l${LIB}w)" > $PKG/usr/lib/lib${LIB}.so + ln -s ${LIB}w.pc $PKG/usr/lib/pkgconfig/${LIB}.pc done + # linker script for the curses library + echo "INPUT(-lncursesw)" > $PKG/usr/lib/libcursesw.so + ln -s libncurses.so $PKG/usr/lib/libcurses.so + + # symlinks for ncurses 5 (remove them later)) + ln -s libncursesw.so $PKG/usr/lib/libncurses.so.5 + ln -s libncursesw.so $PKG/usr/lib/libncursesw.so.5 + + # some progs expect a /usr/include/curses.h ln -s ../curses.h $PKG/usr/include/ncursesw/ncurses.h }