diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-15 13:44:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-15 13:44:56 +0000 |
| commit | 16d3daed247b1695bbf21679b70086c38d044eb7 (patch) | |
| tree | b6f459dfe48396dbd24f046a2f746892a3d8e630 /manifest | |
| parent | 8fe8a39ea9f7811d9c1e2e48a46932561906883f (diff) | |
| parent | a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e (diff) | |
| download | illumos-joyent-16d3daed247b1695bbf21679b70086c38d044eb7.tar.gz | |
[illumos-gate merge]
commit a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e
9472 Add smbutil discon command
commit 4226f635096bf9d814aa9fb335518c4855bbe3a3
6375 Add native name demangling support
commit 83b4671e6262c5aa6b4f9fb5a384b1946dfc2e7f
9664 loader: need UEFI32 support
commit e1bf37b1abeb6653a6e35e2bd6924131cced1efe
9884 cw(1) should use -fpic rather than -Kpic
Conflicts:
usr/src/test/util-tests/tests/Makefile
usr/src/cmd/mdb/common/mdb/mdb_demangle.c
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -5025,6 +5025,8 @@ s usr/lib/amd64/libcurses.so.1=../../../lib/amd64/libcurses.so.1 s usr/lib/amd64/libcurses.so=../../../lib/amd64/libcurses.so.1 f usr/lib/amd64/libdat.so.1 0755 root bin s usr/lib/amd64/libdat.so=libdat.so.1 +f usr/lib/amd64/libdemangle-sys.so.1 0755 root bin +s usr/lib/amd64/libdemangle-sys.so=libdemangle-sys.so.1 s usr/lib/amd64/libdevice.so.1=../../../lib/amd64/libdevice.so.1 s usr/lib/amd64/libdevice.so=../../../lib/amd64/libdevice.so.1 s usr/lib/amd64/libdevid.so.1=../../../lib/amd64/libdevid.so.1 @@ -6433,6 +6435,8 @@ s usr/lib/libcurses.so.1=../../lib/libcurses.so.1 s usr/lib/libcurses.so=../../lib/libcurses.so.1 f usr/lib/libdat.so.1 0755 root bin s usr/lib/libdat.so=libdat.so.1 +f usr/lib/libdemangle-sys.so.1 0755 root bin +s usr/lib/libdemangle-sys.so=libdemangle-sys.so.1 s usr/lib/libdevice.so.1=../../lib/libdevice.so.1 s usr/lib/libdevice.so=../../lib/libdevice.so.1 s usr/lib/libdevid.so.1=../../lib/libdevid.so.1 |