From e399a69c530169e7c839c160f5852aa3bb488684 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Tue, 3 Oct 2017 14:25:31 +0300 Subject: [PATCH] ship libedit the soname is different from libedit in userland, so userland packages depending on libedit should be rebuilt. --- lib/Makefile | 2 +- usr/src/pkg/manifests/SUNWcs.mf | 1 + usr/src/pkg/manifests/library-libedit.mf | 36 ++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 usr/src/pkg/manifests/library-libedit.mf diff --git a/lib/Makefile b/lib/Makefile index 0cea86fe9c..d4f44155a5 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -SUBDIR= libc libcrypto libncurses libssl libtls +SUBDIR= libc libcrypto libedit libncurses libssl libtls MAKEOBJDIRPREFIX?= /usr/obj/${MACHINE} diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf index 36770cf5cd..cdd4e60480 100644 --- a/usr/src/pkg/manifests/SUNWcs.mf +++ b/usr/src/pkg/manifests/SUNWcs.mf @@ -1691,6 +1691,7 @@ link path=usr/spool target=../var/spool link path=usr/tmp target=../var/tmp link path=var/ld/32 target=. link path=var/ld/64 target=$(ARCH64) +depend fmri=library/libedit type=require depend fmri=library/libressl type=require # # Depend on terminfo data. diff --git a/usr/src/pkg/manifests/library-libedit.mf b/usr/src/pkg/manifests/library-libedit.mf new file mode 100644 index 0000000000..b912c2a9c4 --- /dev/null +++ b/usr/src/pkg/manifests/library-libedit.mf @@ -0,0 +1,36 @@ +# Copyright 2017 +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +set name=pkg.fmri value=pkg:/library/libedit@$(PKGVERS) +set name=pkg.description value="editline library (libedit)" +set name=pkg.summary value="editline library (libedit)" +dir path=usr +dir path=usr/include +dir path=usr/lib +dir path=usr/lib/amd64 +dir path=usr/share +dir path=usr/share/man +dir path=usr/share/man/man3 +dir path=usr/share/man/man5 +dir path=usr/share/man/man7 +file path=usr/include/histedit.h +file path=usr/lib/amd64/libedit.so.5.2 mode=0555 +file path=usr/lib/libedit.so.5.2 mode=0555 +file path=usr/share/man/man3/editline.3 +file path=usr/share/man/man5/editrc.5 +file path=usr/share/man/man7/editline.7 +link path=usr/lib/amd64/libedit.so target=libedit.so.5.2 +link path=usr/lib/amd64/libedit.so.5 target=libedit.so.5.2 +link path=usr/lib/libedit.so target=libedit.so.5.2 +link path=usr/lib/libedit.so.5 target=libedit.so.5.2 -- 2.11.4.GIT