diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-06 17:30:28 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-06 17:30:28 (EDT) |
| commit | 632d5d4888354d28f7d03e38c3f8e76f15ad93e7 (patch) | |
| tree | 98d97b07f3b4c0662f5f10271117ac46bcd9aa2b | |
| parent | edbfaf863ca446ab4fc623bec288e6beee00bbce (diff) | |
build: Split DESTDIRs some more
| -rwxr-xr-x | build | 27 |
1 files changed, 19 insertions, 8 deletions
@@ -22,17 +22,19 @@ common_opts = \ --enable-symlinks \ --enable-const build_ncurses_opts = $(common_opts) \ + --with-install-prefix="$${PWD}/dest-ncurses" \ --enable-overwrite build_ncursesw_opts = $(common_opts) \ + --with-install-prefix="$${PWD}/dest-ncursesw" \ --includedir=/usr/include/ncursesw \ --without-progs \ --disable-overwrite \ --enable-widec build_ncurses_legacy_opts = $(build_ncurses_opts) \ - --with-install-prefix="$${PWD}/dest-legacy" \ + --with-install-prefix="$${PWD}/dest-ncurses-legacy" \ --with-abi-version=$(legacy_abi_ver) build_ncursesw_legacy_opts = $(build_ncursesw_opts) \ - --with-install-prefix="$${PWD}/dest-legacy" \ + --with-install-prefix="$${PWD}/dest-ncursesw-legacy" \ --with-abi-version=$(legacy_abi_ver) nop: @@ -51,28 +53,37 @@ install: build (cd obj_ncurses && make install) (cd obj_ncursesw && make install.libs) rm dest*/usr/lib/$(OPK_HOST_ARCH)/*.a - mv dest/usr/bin/clear dest/usr/bin/clear.ncurses - mv dest/usr/bin/reset dest/usr/bin/reset.ncurses + mv dest-ncurses/usr/bin/clear dest-ncurses/usr/bin/clear.ncurses + mv dest-ncurses/usr/bin/reset dest-ncurses/usr/bin/reset.ncurses rm dest*/usr/bin/ncurses*-config - rm dest/usr/share/man/man1/ncurses*-config.1 + rm dest-ncurses/usr/share/man/man1/ncurses*-config.1 @# Extract a few individual terminal type definitions. This would be @# hard to do with oh-installfiles. @# terminfo-linux mkdir -p terminfo-linux.data/usr/lib/ ln -sf ../share/terminfo terminfo-linux.data/usr/lib/terminfo mkdir -p terminfo-linux.data/usr/share/terminfo/l/ - mv dest/usr/share/terminfo/l/linux \ + mv dest-ncurses/usr/share/terminfo/l/linux \ terminfo-linux.data/usr/share/terminfo/l/linux oh-fixperms oh-strip -k OPK_PACKAGES="\ $$(printf '%s\n' $${OPK_PACKAGES} | \ + grep -Ev "lib.*w[.]$(abi_ver)(-dev)?") | \ grep -Ev "lib.*[.]$(legacy_abi_ver)(-dev)?") \ - " oh-installfiles + " oh-installfiles -d dest-ncurses + OPK_PACKAGES="\ + $$(printf '%s\n' $${OPK_PACKAGES} | \ + grep -E "lib.*w[.]$(abi_ver)(-dev)?") \ + " oh-installfiles -d dest-ncursesw OPK_PACKAGES="\ $$(printf '%s\n' $${OPK_PACKAGES} | \ grep -E "lib.*[.]$(legacy_abi_ver)(-dev)?") \ - " oh-installfiles -d dest-legacy + " oh-installfiles -d dest-ncurses-legacy + OPK_PACKAGES="\ + $$(printf '%s\n' $${OPK_PACKAGES} | \ + grep -E "lib.*w[.]$(legacy_abi_ver)(-dev)?") \ + " oh-installfiles -d dest-ncursesw-legacy oh-shlibdeps # Remove self-dependencies. set -e; for f in *.substvars; do p="$${f%.substvars}"; \ |