janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

platform.mk: Fix missing common.mk definitions #124

Merged
Jan Lindemann merged 1 commit from jan/feature/20260923-platform-mk-fix-missing-common-mk-definitions into master 2026-09-23 10:13:38 +02:00 AGit
Conversation 0 Commits 1 Files changed 2 +1 -1
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 83905e021c - Show all commits

platform.mk: Fix missing common.mk definitions
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 10m3s
Details
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 5m35s
Details
CI / Packaging test (pull_request) Successful in 0s
Details
CI / Packaging - Kali Linux (push) Successful in 8m11s
Details
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 5m38s
Details
CI / Packaging test (push) Successful in 0s
Details

Prev Next 
platform.mk needs JWB_SCRIPT_DIR before it checks if TARGET_TUPLE is empty,
otherwise downstream projects including platform.mk without defs.mk error
out (as does jw-bind-zones-ldap-priv via projects.mk:

   /usr/bin/python3.13: can't open file '/jw-pkg.py': [Errno 2] No such file or directory
  ../jw-pkg/make/platform.mk:172: *** TARGET_TUPLE is empty.  Schluss..

The fix is to include common.mk earlier in the stack in platform.mk.
defs.mk then includes it via projects.mk, so remove direct inclusion from
there.

Signed-off-by: Jan Lindemann <jan@janware.com>
Jan Lindemann 2026-09-23 09:42:35 +02:00
commit 83905e021c
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61

1
make/defs.mk
View file

@ -11,7 +11,6 @@ empty :=
space := $(empty) $(empty)
comma := ,
include $(JWBDIR)/make/common.mk
include $(JWBDIR)/make/projects.mk
# ----- Executables

1
make/platform.mk
View file

@ -63,6 +63,7 @@ else
export SHELL := /bin/bash
endif
include $(JWBDIR)/make/common.mk
include $(JWBDIR)/make/py-version.mk
JW_PKG_PY = $(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(JW_PKG_PY_EXTRA_OPTS)