aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariusz Zaborski <oshogbo@FreeBSD.org>2017-11-04 15:50:05 +0000
committerMariusz Zaborski <oshogbo@FreeBSD.org>2017-11-04 15:50:05 +0000
commit0dfac7ee085fe53889299020be38ee88b03df166 (patch)
tree1078c62d7ebecbdc4e0d4ddc480a2c77675e246e
parent95844abe537fcb15313dd6bef6a0adad12458c54 (diff)
downloadsrc-0dfac7ee085fe53889299020be38ee88b03df166.tar.gz
src-0dfac7ee085fe53889299020be38ee88b03df166.zip
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
Notes
Notes: svn path=/head/; revision=325399
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--lib/libcasper/libcasper/Makefile6
-rw-r--r--lib/libcasper/services/cap_random/Makefile3
3 files changed, 7 insertions, 4 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 7e12fe6484a3..979483ba44e7 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -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
diff --git a/lib/libcasper/libcasper/Makefile b/lib/libcasper/libcasper/Makefile
index c1af1edd75cc..729bf071846a 100644
--- a/lib/libcasper/libcasper/Makefile
+++ b/lib/libcasper/libcasper/Makefile
@@ -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
diff --git a/lib/libcasper/services/cap_random/Makefile b/lib/libcasper/services/cap_random/Makefile
index 45141d47bca8..fad8e3f9cdb7 100644
--- a/lib/libcasper/services/cap_random/Makefile
+++ b/lib/libcasper/services/cap_random/Makefile
@@ -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"