stop trying to add -j to the variable, it simply doesnt work

This commit is contained in:
kreuzerkrieg 2021-12-16 12:53:02 +02:00
parent 2f2d98d8be
commit c3e640bfaf

10
debian/rules vendored
View File

@ -77,10 +77,6 @@ else
THREADS_COUNT = 1 THREADS_COUNT = 1
endif endif
ifneq ($(THREADS_COUNT),)
THREADS_COUNT:=-j$(THREADS_COUNT)
endif
%: %:
dh $@ $(DH_FLAGS) --buildsystem=cmake dh $@ $(DH_FLAGS) --buildsystem=cmake
@ -89,11 +85,11 @@ override_dh_auto_configure:
override_dh_auto_build: override_dh_auto_build:
# Fix for ninja. Do not add -O. # Fix for ninja. Do not add -O.
$(MAKE) $(THREADS_COUNT) -C $(BUILDDIR) $(MAKE_TARGET) $(MAKE) -j$(THREADS_COUNT) -C $(BUILDDIR) $(MAKE_TARGET)
override_dh_auto_test: override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
cd $(BUILDDIR) && ctest $(THREADS_COUNT) -V cd $(BUILDDIR) && ctest -j$(THREADS_COUNT) -V
endif endif
override_dh_clean: override_dh_clean:
@ -120,7 +116,7 @@ override_dh_install:
dh_install --list-missing --sourcedir=$(DESTDIR) dh_install --list-missing --sourcedir=$(DESTDIR)
override_dh_auto_install: override_dh_auto_install:
env DESTDIR=$(DESTDIR) $(MAKE) $(THREADS_COUNT) -C $(BUILDDIR) install env DESTDIR=$(DESTDIR) $(MAKE) -j$(THREADS_COUNT) -C $(BUILDDIR) install
override_dh_shlibdeps: override_dh_shlibdeps:
true # We depend only on libc and dh_shlibdeps gives us wrong (too strict) dependency. true # We depend only on libc and dh_shlibdeps gives us wrong (too strict) dependency.