d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only build jevents if MK_PMC is yes and only for amd64 in libcompat.

Browse Source 
Sponsored by:	Dell EMC
This commit is contained in:
Bryan Drewery 2018-06-15 16:48:09 +00:00
parent ad2afa8c8b
commit 6f1f2b1931
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.inc1
View File

@ -2033,7 +2033,8 @@ _tcsh=bin/csh
_libmagic=lib/libmagic _libmagic=lib/libmagic
.endif .endif
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" .if ${MK_PMC} != "no" && \
(${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386")
_jevents=lib/libpmc/pmu-events _jevents=lib/libpmc/pmu-events
.endif .endif

7
Makefile.libcompat
View File

@ -155,6 +155,11 @@ _LC_INCDIRS= \
lib/ncurses/ncursesw \ lib/ncurses/ncursesw \
${_LC_LIBDIRS.yes} ${_LC_LIBDIRS.yes}
.if ${MK_PMC} != "no" && ${TARGET_ARCH} == "amd64"
_jevents= lib/libpmc/pmu-events
.endif
# Shared logic # Shared logic
build${libcompat}: .PHONY build${libcompat}: .PHONY
@echo @echo
@ -192,7 +197,7 @@ build${libcompat}: .PHONY
DIRPRFX=${_dir}/ ${_t} DIRPRFX=${_dir}/ ${_t}
.endfor .endfor
.endfor .endfor
.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic lib/libpmc/pmu-events .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic ${_jevents}
${_+_}cd ${.CURDIR}/${_dir}; \ ${_+_}cd ${.CURDIR}/${_dir}; \
WORLDTMP=${WORLDTMP} \ WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \