diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-06 19:21:31 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-06 19:23:26 (EDT) |
| commit | 1e5a00d2c67e052620b831ba3b63bbefff89b0bd (patch) | |
| tree | 6e367aa5e0c89801d7934f89f3f7febb968d0b9f | |
| parent | 5b71c6321f712100dff4fc7ca3d73035fcf4a8fd (diff) | |
build: Use --with-termlib/--with-ticlib to rename libs
| -rwxr-xr-x | build | 20 | ||||
| -rw-r--r-- | libtinfow.5.pkg/control | 4 | ||||
| -rw-r--r-- | libtinfow.5.pkg/files | 1 | ||||
| -rw-r--r-- | libtinfow.6.pkg/control | 4 | ||||
| -rw-r--r-- | libtinfow.6.pkg/files | 1 |
5 files changed, 12 insertions, 18 deletions
@@ -16,20 +16,22 @@ common_opts = \ --with-cxx-shared \ --without-debug \ --without-profile \ - --with-termlib=tinfo \ - --with-ticlib=tic \ --disable-termcap \ --enable-symlinks \ --enable-const build_ncurses_opts = $(common_opts) \ --with-install-prefix="$${PWD}/dest-ncurses" \ - --enable-overwrite + --enable-overwrite \ + --with-termlib=tinfo \ + --with-ticlib=tic build_ncursesw_opts = $(common_opts) \ --with-install-prefix="$${PWD}/dest-ncursesw" \ --includedir=/usr/include/ncursesw \ --without-progs \ --disable-overwrite \ - --enable-widec + --enable-widec \ + --with-termlib=tinfow \ + --with-ticlib=ticw build_ncurses_legacy_opts = $(build_ncurses_opts) \ --with-install-prefix="$${PWD}/dest-ncurses-legacy" \ --with-abi-version=$(legacy_abi_ver) @@ -55,16 +57,6 @@ install: build rm dest*/usr/lib/$(OPK_HOST_ARCH)/*.a mv dest-ncurses/usr/bin/clear dest-ncurses/usr/bin/clear.ncurses mv dest-ncurses/usr/bin/reset dest-ncurses/usr/bin/reset.ncurses - @# Rename wide-char libtinfo to libtinfow. - set -e; pc=usr/lib/$(OPK_HOST_ARCH)/pkgconfig/ncursesw.pc; \ - for d in dest-ncursesw dest-ncursesw-legacy; do \ - (cd $${d}/usr/lib/$(OPK_HOST_ARCH); \ - for f in libtinfo*; do \ - mv "$${f}" "libtinfow$${f#libtinfo}"; \ - done); \ - mv $${d}/$${pc} $${d}/$${pc}.orig; \ - sed 's/-ltinfo/-ltinfow/' $${d}/$${pc}.orig 1>$${d}/$${pc}; \ - done rm dest*/usr/bin/ncurses*-config rm dest-ncurses/usr/share/man/man1/ncurses*-config.1 @# Extract a few individual terminal type definitions. This would be diff --git a/libtinfow.5.pkg/control b/libtinfow.5.pkg/control index 7c2be40..061a998 100644 --- a/libtinfow.5.pkg/control +++ b/libtinfow.5.pkg/control @@ -1,7 +1,7 @@ Architecture: any Platform: all -Depends: ncurses-common (= ${Source-Version}), libtinfo.5 (= ${Binary-Version}), - terminfo-linux [any-linux-any], ${Shlib-Depends} +Depends: ncurses-common (= ${Source-Version}), terminfo-linux [any-linux-any], + ${Shlib-Depends} Description: curses terminfo library with wide character support (legacy ABI) ${Common-Description} . diff --git a/libtinfow.5.pkg/files b/libtinfow.5.pkg/files index 0edcd49..ce5d9f8 100644 --- a/libtinfow.5.pkg/files +++ b/libtinfow.5.pkg/files @@ -1 +1,2 @@ /usr/lib/*/libtinfow.so.* +/usr/lib/*/libticw.so.* diff --git a/libtinfow.6.pkg/control b/libtinfow.6.pkg/control index 7ba43f8..429d564 100644 --- a/libtinfow.6.pkg/control +++ b/libtinfow.6.pkg/control @@ -1,7 +1,7 @@ Architecture: any Platform: all -Depends: ncurses-common (= ${Source-Version}), libtinfo.5 (= ${Binary-Version}), - terminfo-linux [any-linux-any], ${Shlib-Depends} +Depends: ncurses-common (= ${Source-Version}), terminfo-linux [any-linux-any], + ${Shlib-Depends} Description: curses terminfo library with wide character support ${Common-Description} . diff --git a/libtinfow.6.pkg/files b/libtinfow.6.pkg/files index 0edcd49..ce5d9f8 100644 --- a/libtinfow.6.pkg/files +++ b/libtinfow.6.pkg/files @@ -1 +1,2 @@ /usr/lib/*/libtinfow.so.* +/usr/lib/*/libticw.so.* |