diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-03 11:38:44 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-03 11:38:44 +0000 |
| commit | 1c5ac86169ba0e28b070d8b7f6c787be64bce7e4 (patch) | |
| tree | 984f229706437e50b866d25cd3aced33f9358a5f /usr/src/lib/Makefile | |
| parent | ed13e9ae4cee8abfe808486d0e0d7ee69b8fc256 (diff) | |
| parent | d15d17d4231f87f1571fa6d585377206f360f667 (diff) | |
| download | illumos-joyent-1c5ac86169ba0e28b070d8b7f6c787be64bce7e4.tar.gz | |
[illumos-gate merge]
commit d15d17d4231f87f1571fa6d585377206f360f667
12786 fix CTF pointer overrun
commit 8fff788790878e3c95666decd46960ecc74c1c69
12721 would like svcadm disable -c
commit 87be0d9605ee884229638b6fd168fa7165e109a3
12813 pptadm and libppt are x86 only
commit 069e6b7e31ba5dcbc5441b98af272714d9a5455c
12708 Packages could be linted
12717 Stop ignoring pkgdepend errors
commit 605d010da59abaf92279a7caed83515cbb3218dc
7510 enable highres clock usage for non-privileged users
Conflicts:
usr/src/man/man3c/timer_settime.3c
Diffstat (limited to 'usr/src/lib/Makefile')
| -rw-r--r-- | usr/src/lib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 9fd28c40f6..a0221ca855 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -188,7 +188,6 @@ SUBDIRS += \ libpkg \ libpool \ libpp \ - libppt \ libproc \ libproject \ libpthread \ @@ -287,6 +286,7 @@ SUBDIRS += \ i386_SUBDIRS= \ libfdisk \ + libppt \ libsaveargs \ libvmm \ libvmmapi @@ -457,7 +457,6 @@ HDRSUBDIRS= \ libpicltree \ libpool \ libpp \ - libppt \ libproc \ libraidcfg \ librcm \ @@ -520,6 +519,7 @@ HDRSUBDIRS= \ i386_HDRSUBDIRS= \ libfdisk \ + libppt \ libsaveargs \ libvmm \ libvmmapi |