ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/trunk/Makefile.inc1
(Generate patch)

Comparing trunk/Makefile.inc1 (file contents):
Revision 8977 by laffer1, Fri Sep 30 01:10:03 2016 UTC vs.
Revision 9346 by laffer1, Sat Mar 4 16:46:02 2017 UTC

# Line 295 | Line 295 | LIB32CPUFLAGS= -march=${TARGET_CPUTYPE}
295   LIB32WMAKEENV=  MACHINE=i386 MACHINE_ARCH=i386 \
296                  MACHINE_CPU="i686 mmx sse sse2"
297   LIB32WMAKEFLAGS=        \
298 <                AS="${AS} --32"
298 >                AS="${AS} --32" \
299                  LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32"
300   .endif
301  
# Line 322 | Line 322 | LIB32WMAKEFLAGS+=      \
322                  CXX="${CXX} ${LIB32FLAGS}" \
323                  DESTDIR=${LIB32TMP} \
324                  -DCOMPAT_32BIT \
325 +                -DLIBRARIES_ONLY \
326                  -DNO_CPU_CFLAGS \
327                  -DNO_CTF \
328                  -DNO_LINT
329  
330   LIB32WMAKE=     ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
331 <                -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
331 >                -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
332 >                -DWITHOUT_HTML -DNO_CTF -DNO_LINT \
333 >                DESTDIR=${LIB32TMP}
334   LIB32IMAKE=     ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
335                  ${IMAKE_INSTALL}
336   .endif
# Line 588 | Line 591 | kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_librar
591   # Checks to be sure system is ready for installworld/installkernel.
592   #
593   installcheck:
594 + installcheck_UGID:
595  
596   #
597   # Require DESTDIR to be set if installing for a different architecture or
# Line 619 | Line 623 | CHECK_GIDS+=   smmsp
623   CHECK_UIDS+=    proxy
624   CHECK_GIDS+=    proxy authpf
625   .endif
622 – installcheck: installcheck_UGID
626   installcheck_UGID:
627   .for uid in ${CHECK_UIDS}
628          @if ! `id -u ${uid} >/dev/null 2>&1`; then \
# Line 673 | Line 676 | EXTRA_DISTRIBUTIONS+=  games
676   EXTRA_DISTRIBUTIONS+=   lib32
677   .endif
678  
679 < distributeworld installworld: installcheck
679 > distributeworld installworld: installcheck installcheck_UGID
680          mkdir -p ${INSTALLTMP}
681          progs=$$(for prog in ${ITOOLS}; do \
682                  if progpath=`which $$prog`; then \
# Line 1309 | Line 1312 | _prebuild_libs=        ${_kerberos5_lib_libasn1} \
1312                  lib/libopie lib/libpam ${_lib_libthr} \
1313                  lib/libradius lib/libsbuf lib/libtacplus \
1314                  ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
1315 +                ${_cddl_lib_libzfs_core} \
1316                  lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
1317                  ${_secure_lib_libcrypto} ${_secure_lib_libssh} \
1318                  ${_secure_lib_libssl} lib/libsqlite3 \
# Line 1333 | Line 1337 | _apache_lib= apache/lib
1337   .if ${MK_CDDL} != "no"
1338   _cddl_lib_libumem= cddl/lib/libumem
1339   _cddl_lib_libnvpair= cddl/lib/libnvpair
1340 + _cddl_lib_libzfs_core= cddl/lib/libzfs_core
1341   _cddl_lib= cddl/lib
1342 + cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
1343   .endif
1344  
1345   .if ${MK_CRYPT} != "no"

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines