diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-05-21 08:30:05 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-05-21 08:31:10 +0200 |
| commit | d2e4e0b2d3228df21eb680d35a9581269c953ed5 (patch) | |
| tree | 434c65c6b7b2ab7109fcbae2e3c7c6cb67b640de | |
| parent | b28f6ea53508bdd8c4b973791a5eb973b83c1544 (diff) | |
| download | OSELAS.Toolchain-d2e4e0b2d3228df21eb680d35a9581269c953ed5.tar.gz OSELAS.Toolchain-d2e4e0b2d3228df21eb680d35a9581269c953ed5.tar.xz | |
cross-gdb: always build with python support
Disabling Python support was a crude hack to minimize dependencies for
binary tarballs. This doesn't make sense any more since there are now
several other dependencies anyways. So just drop the hack.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rwxr-xr-x | build_all_v2.mk | 3 | ||||
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rw-r--r-- | rules/cross-gdb.make | 10 |
3 files changed, 4 insertions, 14 deletions
diff --git a/build_all_v2.mk b/build_all_v2.mk index 1a80730..66cccd6 100755 --- a/build_all_v2.mk +++ b/build_all_v2.mk @@ -16,9 +16,6 @@ BENICE := true PTXDIST := ./p ARG := images -export PTXDIST_ENV_WHITELIST += CROSS_GDB_WITHOUT_PYTHON -export CROSS_GDB_WITHOUT_PYTHON ?= y - ifdef BENICE NICE += nice -20 endif diff --git a/debian/rules b/debian/rules index d08735b..7dd9f33 100755 --- a/debian/rules +++ b/debian/rules @@ -21,11 +21,10 @@ debian/ptxdistrc: fi >> $@ PTXDIST_ENV := \ - PTXDIST_PTXRC=$(CURDIR)/debian/ptxdistrc \ - CROSS_GDB_WITHOUT_PYTHON=n + PTXDIST_PTXRC=$(CURDIR)/debian/ptxdistrc override_dh_auto_build: debian/ptxdistrc - $(PTXDIST_ENV) make -f build_all_v2.mk ARG="-j -q go" PTXDIST="$(PTXDIST)" $(TOOLCHAINS) + $(PTXDIST_ENV) make -j4 -f build_all_v2.mk ARG="-j -q go" PTXDIST="$(PTXDIST)" $(TOOLCHAINS) override_dh_auto_install-arch: rm -rf $(CURDIR)/debian/tmp/opt diff --git a/rules/cross-gdb.make b/rules/cross-gdb.make index dc958cd..69462d8 100644 --- a/rules/cross-gdb.make +++ b/rules/cross-gdb.make @@ -47,13 +47,7 @@ CROSS_GDB_CONF_OPT := \ \ --disable-werror \ --enable-tui \ - --with-expat - -# define this from the outside to build without python -ifeq ($(CROSS_GDB_WITHOUT_PYTHON),y) -CROSS_GDB_CONF_OPT += --without-python -else -CROSS_GDB_CONF_OPT += --with-python=python3 -endif + --with-expat \ + --with-python=python3 # vim: syntax=make |