Date: Sat, 4 Nov 2017 15:50:05 +0000 (UTC) From: Mariusz Zaborski <oshogbo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325399 - in head: . lib/libcasper/libcasper lib/libcasper/services/cap_random Message-ID: <201711041550.vA4Fo583026640@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: oshogbo Date: Sat Nov 4 15:50:05 2017 New Revision: 325399 URL: https://svnweb.freebsd.org/changeset/base/325399 Log: The src.opts.mk sets default value for the SHLIBDIR, so our set was not respected. Please notice that libcasper is already in ObsoleteFiles so we don't add it again. Reported by: Herbert J. Skuhra <herbert@mailbox.org> Reviewed by: bdrewery@ Differential Revision: https://reviews.freebsd.org/D12918 Modified: head/ObsoleteFiles.inc head/lib/libcasper/libcasper/Makefile head/lib/libcasper/services/cap_random/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Nov 4 15:47:18 2017 (r325398) +++ head/ObsoleteFiles.inc Sat Nov 4 15:50:05 2017 (r325399) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20171104: libcap_random should be in /lib not in /usr/lib +OLD_LIBS+=usr/lib/libcap_random.so.0 # 20171104: Casper can work only as shared library OLD_FILES+=usr/lib/libcasper.a OLD_FILES+=usr/lib/libcasper_p.a Modified: head/lib/libcasper/libcasper/Makefile ============================================================================== --- head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:47:18 2017 (r325398) +++ head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:50:05 2017 (r325399) @@ -1,14 +1,14 @@ # $FreeBSD$ +SHLIBDIR?= /lib + .include <src.opts.mk> PACKAGE=${LIB} -SHLIB_MAJOR= 0 -SHLIBDIR?= /lib - .if ${MK_CASPER} != "no" SHLIB= casper +SHLIB_MAJOR= 0 SRCS= libcasper.c SRCS+= libcasper_impl.c Modified: head/lib/libcasper/services/cap_random/Makefile ============================================================================== --- head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:47:18 2017 (r325398) +++ head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:50:05 2017 (r325399) @@ -1,11 +1,12 @@ # $FreeBSD$ +SHLIBDIR?= /lib/casper + .include <src.opts.mk> PACKAGE=libcasper SHLIB_MAJOR= 0 -SHLIBDIR?= /lib/casper INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711041550.vA4Fo583026640>