@@ -145,26 +145,25 @@ include $(PROJECT_ROOT)/Mk/xcode.mk
145145ifneq ($(wildcard /usr/include/libproc.h) ,)
146146FEATURES+ = -DHAVE_DARWIN_LIBPROC
147147endif
148- OSX_VERSION = $(shell sw_vers -productVersion)
148+ OSX_VERSION: = $(shell sw_vers -productVersion)
149+ XNU_HAVE: = $(shell uname -a|sed 's/^.* root:xnu-//g'|sed 's/~.* $$//')
149150ifneq ($(XNU_VERSION ) ,)
150151XNU_METHOD = override
151- XNU_HAVE = $(shell uname -a|sed 's/^.* root:xnu-//g'|sed 's/~.* $$//')
152152else
153153XNU_METHOD = uname
154- XNU_VERSION = $(shell uname -a|sed 's/^.* root:xnu-//g'|sed 's/~.* $$//')
155- XNU_HAVE: = $(XNU_VERSION )
154+ XNU_VERSION = $(XNU_HAVE )
156155endif
157156ifeq ($(wildcard $(PROJECT_ROOT ) /xnu/xnu-$(XNU_VERSION ) ) ,)
158157XNU_METHOD = sw_vers
159- XNU_VERSION = $(shell awk '/^XNU_RELS.* \# $(OSX_VERSION ) $$/ {print $$2}' $(PROJECT_ROOT ) /xnu/GNUmakefile)
158+ XNU_VERSION: = $(shell awk '/^XNU_RELS.* \# $(OSX_VERSION ) $$/ {print $$2}' $(PROJECT_ROOT ) /xnu/GNUmakefile)
160159endif
161160ifeq ($(wildcard $(PROJECT_ROOT ) /xnu/xnu-$(XNU_VERSION ) ) ,)
162161XNU_METHOD = fallback
163- XNU_VERSION = $(shell awk '/^XNU_RELS/ {print $$2}' $(PROJECT_ROOT ) /xnu/GNUmakefile|tail -1)
162+ XNU_VERSION: = $(shell awk '/^XNU_RELS/ {print $$2}' $(PROJECT_ROOT ) /xnu/GNUmakefile|tail -1)
164163endif
165164ifneq ($(wildcard $(PROJECT_ROOT ) /xnu/xnu-$(XNU_VERSION ) ) ,)
166165FEATURES+ = -DHAVE_PF
167- PKG_CPPFLAGS + = -I$(PROJECT_ROOT ) /xnu/xnu-$(XNU_VERSION )
166+ CPPFLAGS + = -I$(PROJECT_ROOT ) /xnu/xnu-$(XNU_VERSION )
168167BUILD_INFO+ = OSX:$(OSX_VERSION ) XNU:$(XNU_VERSION ) :$(XNU_METHOD ) :$(XNU_HAVE )
169168endif
170169endif
@@ -374,6 +373,10 @@ $(error dependency 'libnet' not found; \
374373endif
375374endif
376375
376+ PKG_CFLAGS: =
377+ PKG_CPPFLAGS: =
378+ PKG_LDFLAGS: =
379+ PKG_LIBS: =
377380ifdef OPENSSL_FOUND
378381PKG_CPPFLAGS+ = -I$(OPENSSL_FOUND ) /include
379382ifneq ($(findstring openssl-3.,$(OPENSSL_FOUND ) ) ,openssl-3.)
@@ -413,6 +416,11 @@ PKG_LDFLAGS+= -L$(SQLITE_FOUND)/lib
413416PKG_LIBS+ = -lsqlite3
414417endif
415418endif
419+
420+ TPKG_CFLAGS: =
421+ TPKG_CPPFLAGS: =
422+ TPKG_LDFLAGS: =
423+ TPKG_LIBS: =
416424ifdef CHECK_FOUND
417425TPKG_CPPFLAGS+ = -I$(CHECK_FOUND ) /include
418426TPKG_LDFLAGS+ = -L$(CHECK_FOUND ) /lib
0 commit comments