aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2015-12-01 06:09:22 +0000
committerEnji Cooper <ngie@FreeBSD.org>2015-12-01 06:09:22 +0000
commit5a536241ea2b6cb8146aa2be220bc7c0ec247bc9 (patch)
tree668afb0f04f344b310fc76ee329f028ecec2625e
parentaf5c99e53f6f7667087fcdef9042032017b431ca (diff)
downloadsrc-5a536241ea2b6cb8146aa2be220bc7c0ec247bc9.tar.gz
src-5a536241ea2b6cb8146aa2be220bc7c0ec247bc9.zip
Move libelf.so.2 from /usr/lib to /lib to unbreak libkvm use after r291406
Tested with the following commands as root: - yes | make delete-old - service ldconfig restart - netstat -nr X-MFC with: r291406 Reviewed by: jhb, kib Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=291566
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--lib/libelf/Makefile1
2 files changed, 3 insertions, 0 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index ab6762708fc1..9a8e230c5e73 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
+OLD_FILES+=usr/lib/libelf.so.2
# 20151115: Fox bad upgrade scheme
OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile
index b8aa4df64c67..51509f71d71f 100644
--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
@@ -7,6 +7,7 @@ SRCDIR= ${TOP}/libelf
.PATH: ${SRCDIR}
LIB= elf
+SHLIBDIR?= /lib
SRCS= elf.c \
elf_begin.c \