Date: Tue, 21 Jan 2014 11:00:18 -0700 From: Alan Somers <asomers@freebsd.org> To: "freebsd-testing@freebsd.org" <freebsd-testing@freebsd.org> Subject: PATCH: fix "WITH_TESTS=yes make installworld" on amd64 Message-ID: <CAOtMX2jvBirXFSha7FTvsszQFfjVjWOLdfWEeky3VXnEE0Krjg@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
I finally found the problem. Make was trying to install tests during
the install32 phase. During this phase, it adds "lib32" to
MAKEOBJDIRPREFIX, so it can't find the tests, which were never built
with that prefix. The command worked fine when I ran it under "make
buildenv", because that uses the normal MAKEOBJDIRPREFIX.
I'm not sure what prevented the tests from being built during the
lib32 build phase, but this patch will disable tests during both
building and installing 32 bit libraries.
At work, we never noticed this problem in our SpectraBSD branch
because we set WITHOUT_LIB32=1 in /etc/src.conf.
Does this patch look ok? Should I be disabling tests some other way?
I looked for a way to disable recursing into the tests directories
whenever LIBRARIES_ONLY was set, but didn't see an easy way.
-Alan
Index: Makefile.inc1
===================================================================
--- Makefile.inc1 (revision 260986)
+++ Makefile.inc1 (working copy)
@@ -417,7 +417,7 @@
-DNO_LINT
LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
- -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
+ -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML -DNO_TESTS
LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
${IMAKE_INSTALL}
.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOtMX2jvBirXFSha7FTvsszQFfjVjWOLdfWEeky3VXnEE0Krjg>