Commit graph

2,119 commits

Author SHA1 Message Date
921a929cd3 Ubuntu: Fix PY_SITE_PACKAGES_PATH
PY_SITE_PACKAGES_PATH is set to the first element site.getsitepackages(), which
(correctly, but in this case undesirably) is below /usr/local. Use the first
path which is not.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-13 12:49:27 +00:00
ee012a8d35 defs.mk: Fix PKG_FORMAT for Ubuntu
The PKG_FORMAT variable for Ubuntu points to rpm, which is wrong. Fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-13 12:49:25 +00:00
34a42cd0a4 defs.mk: Fix uniq
uniq failed on empty argument lists, fix that

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-12 18:44:36 +00:00
35def547bf py-mod.mk: Add support to async function definitions
The async keyword confused python-tools.sh, this commit fixes that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-10-28 12:20:51 +00:00
9f0276ead5 py-defs.mk: Fix clean target
pyc.clean was broken because it did rm -f __pycache__ (a directory)
Also, add include guards.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-10-28 12:20:50 +00:00
01685f5ff0 git-submod.mk: Fix vars for not yet existent submodule
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-10-01 10:55:33 +00:00
23ce1b8642 platform.mk / defs.mk fix: SHELL was referenced before definition
SHELL defaults to /bin/sh on Ubuntu 16, and was used to get-os.sh, which fails

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-08-02 05:48:32 +00:00
0944f009db doxygen.mk: Code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-29 10:32:48 +00:00
32edd25779 debugger.mk: Fix core file parsing from GDB output
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-22 15:50:40 +00:00
fe69ec6248 run.mk: Remove all core files before run
Fix: Make sure that all core files are removed before the run target's command
is executed.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-14 13:23:14 +00:00
7d7a75c389 debugger.mk, defs-cpp.mk: CORE_DUMPER was misdetected for valgrind vgcore files
gdb --core=vgcore.123 doesn't output a usable executable path with "was
generated by ...".  This commit make make gdb fall back to using $(EXE_PATH) as
the executable with valgrind core files.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-13 17:14:38 +00:00
770a42cc76 subtree.mk: Add multiple-inclusion guards
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-12 12:19:41 +00:00
31d11febd8 python-cli.mk, topdir.mk: Python2 -> $(PYTHON)
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-06 14:39:33 +00:00
9e0d5db438 topdir-autoconf.mk: Fix distclean target
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-06 14:38:56 +00:00
cc929baf99 defs-cpp.mk: Add support for SRC_ALL_CPP_IGNORE
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-06 14:34:33 +00:00
d36ec44d5e lo.mk: Fix support for LOADABLE_OBJ_IGNORE
LOADABLE_OBJ_IGNORE still had stuff rebuilt that should have been ignored, this
commit fixes that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-06 14:33:36 +00:00
e0f2e04447 Fix: Failing $(PREREQ_DIRS_DONE) doesn\'t have sub-subdirectories rebuilt
Subdirectories are now always rebuilt with FORCE_REBUILD_SUBDIRS=true.
Otherwise the above check fails to even reach the source code.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-01 17:59:09 +00:00
07abf3f93e topdir.mk + dirs.mk fix: $(PREREQ_DIRS_DONE) was not checked
dirs-all.done doesn\'t check $(PREREQ_DIRS_DONE), this commit fixes that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-01 17:37:10 +00:00
6c2fa903c7 Fix: Don't set CC, LD, CXX via ?=
CC, LD and CXX are builtin, and they also override ?=, so ?= is pointless.

This solution disallows specifying a compiler from the environment. There
should be some solution with $(origin CC), but this seems too clunky for now.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-01 15:48:28 +00:00
bdd66dbc26 Everywhere: Rename MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR
Follow name change of MODDIR -> JWBDIR.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:45:24 +00:00
b2d6e6f554 Everywhere: Rename MODDIR -> JWBDIR
Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the
point.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:34:18 +00:00
1ff63505e7 defs-cpp.mk: Beautify defs-cpp.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 19:50:33 +00:00
3985c929ae topdir.mk: Ignore SUBDIRS without Makefile
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 19:09:08 +00:00
b3659f75b8 defs.mk: Default to 1.0.0-0-dev, if $(TOPDIR)/VERSION is absent
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 19:06:41 +00:00
50af65812d $(TOPDIR)/make: Beautify makefile indendation
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-26 08:00:30 +00:00
7fc3e196e9 projects.mk: Minimal beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 20:34:24 +00:00
3365aa3db6 make: Replace BUILD_XXX make flag variables by FINAL_XXX
The following BUILD_XXX variables are renamed to their respective FINAL_XXX
counterparts, as that name is more expressive:

  BUILD_CFLAGS, BUILD_CPPFLAGS, BUILD_CXXFLAGS, BUILD_EXTRA_DEBUG_FLAGS,
  BUILD_INCLUDE, BUILD_LDFLAGS, BUILD_LIBFLAGS, BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 12:58:53 +00:00
e0486a936e make/Makefile, list-files.mk: Code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 12:45:27 +00:00
da09c46fa3 defs-cpp.mk: Defs-cpp.mk performance optimization
Disable most external code for clean targets

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 12:45:15 +00:00
15579e94d3 projects.mk + defs.mk: Make some variables more universally usable
- Remove temporary variable PRJS_DIR
- Add defaults for BUILD_LIBS_PREFIX and BUILD_TOOLS_PREFIX
- Move definitions of varables needed early on from defs.mk
  into projects.mk, such as PYTHON and PYTHON_VERSION

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 12:44:14 +00:00
837f8f97bb swig.mk: Fix multiple file location issues
This commit fixes multiple issues with locating Perl and Python directories and
files. It was driven by the need to have it work on Yocto, and isn't tested
anywhere else. It also fixes __pycache__/%.pyc issues from the Python 2 -> 3
transition.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 12:34:43 +00:00
48d1bd0256 projects-dir.mk: Comment beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 12:34:42 +00:00
db312ff766 py-rules.mk: Make more consistent use of PY_CPYTHON_PREFIX
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-22 12:11:43 +00:00
fb2f57b7b9 py-mod.mk, py-rules.mk: Split up py-mod.mk in py-mod.mk and py-rules.mk
py-rules.mk is meant to be usable outside of a jw Python module
context, just for generating .pyc, for example

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-22 10:11:44 +00:00
3ddd952187 swig.mk: Swith to Python 3
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-22 09:32:31 +00:00
0ad800315d proj.mk: Remove references to cfg_dist.mk and cfg_dev.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-21 11:52:45 +00:00
5f396a1f95 defs.mk:: Define variables empty, space and comma
Move definitions of empty, space and comma from targets-tools.mk into
defs.mk.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-21 09:32:54 +00:00
6518c78297 cfg_dev.mk, cfg_dist.mk: Remove empty cfg_dist.mk cfg_dev.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-21 09:27:18 +00:00
753ad90160 project.conf: Make OpenEmbedded build work
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-19 10:11:02 +00:00
548b4bc960 subtree.mk: Beautify target dependencies
Not tested, but can't hurt to have the installed regular files
depend on their install directories

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-19 10:08:28 +00:00
a627b1273e projects-dir.mk: Beautify header
Remove CVS macros, because that breaks using it as a symlink from projects-dir,
and add SPDX-License-Identifier GPL2.0+.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-19 08:10:35 +00:00
2b7896d55f scripts.mk: Remove include defs-cpp.mk from scripts.mk
I don't know why it's there. This commit could break something.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 15:17:53 +00:00
0c04c0fccd project.conf: Add some dependencies for building with yocto
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 15:12:03 +00:00
ab51bdd20d proj.mk: Remove legacy variables
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 15:10:32 +00:00
cbbd8011e3 projects-dir.mk: Remove links.done machinery
Remove legacy links.done, since dspider-shared and dspider-btools are now
converted to git projects below the toplevel directory.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 10:22:19 +00:00
cbd944d254 rules.mk: Use $(CXX) instead of $(LD) for linking
CXX is used for linking instead of LD now, since LD might point to the real
linker, which doesn't understand -Wl,--blah options, of course.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 10:06:50 +00:00
b1187d9d8a rules.mk: Use $(CXX) instead of $(LD) for linking
CXX is used for linking instead of LD now, since LD might point to the real
linker, which doesn't understand -Wl,--blah options, of course.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 10:03:22 +00:00
458fe33260 conf/profile, make, scripts: Search-and-replace cvs.jannet.de -> cvs.janware.com
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 08:15:28 +00:00
7e811aa755 rpmdist.mk: Rename target tgz to pkg-tgz for consistency
Rename tgz to pkg-tgz, even though at this point it isn't functional

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 08:14:44 +00:00
d84260a2ad listfiles.mk: Fix cpio --directory option
cpio -D doesn't mean the same thing for different versions of cpio,
--directory does, so use that

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-13 11:50:10 +00:00