diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2018-06-25 19:55:15 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2018-06-25 19:55:15 +0000 |
commit | e4b0a90e771b94e4b043729a6f0f5564f1d01aca (patch) | |
tree | 2cb4088f70d2963a7584dc9069c3c90a27081d45 /Makefile.inc1 | |
parent | 9c42fa94a63fc22aee2bd106aa12bfa7388f3911 (diff) | |
download | src-test2-e4b0a90e771b94e4b043729a6f0f5564f1d01aca.tar.gz src-test2-e4b0a90e771b94e4b043729a6f0f5564f1d01aca.zip |
Normalize the g(eom,cache,part,...) build.
Rather then combining hardlink creation for the geom(8) binary with
shared library build, move libraries to src/lib/geom so they are
built and installed normally. Create a common Makefile.classes
which is included by both lib/geom/Makefile and sbin/geom/Makefile
so the symlink and libraries stay in sync.
The relocation of libraries allows libraries to be build for 32-bit
compat. This also reduces the number of non-standard builds in
the system.
This commit is not sufficent to run a 32-bit /sbin/geom on a 64-bit
system out of the box as it will look in the wrong place for libraries
unless GEOM_LIBRARY_PATH is set appropriatly in the environment.
Reviewed by: bdrewery
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D15360
Notes
Notes:
svn path=/head/; revision=335645
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 769441d20ec4..e20a9b343c61 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -952,7 +952,7 @@ _worldtmp: .PHONY @touch ${WORLDTMP}/${.TARGET} .for _dir in \ - lib lib/casper usr legacy/bin legacy/usr + lib lib/casper lib/geom usr legacy/bin legacy/usr mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ @@ -2507,6 +2507,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_cddl_lib_libavl} \ ${_cddl_lib_libzfs_core} \ ${_cddl_lib_libctf} \ + lib/libufs \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ ${_secure_lib_libssh} ${_secure_lib_libssl} |