!201 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

Merge pull request !201 from shenmo/auto-4915358-dev-844840b2
This commit is contained in:
2023-03-02 15:32:32 +00:00
committed by Gitee
3 changed files with 3 additions and 5 deletions

View File

@@ -32,8 +32,7 @@ stages:
- cd ..
- rm -rf dtk-old-bundle
- 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" '
- sed -i 's/-j$(JOBS)/-j2/g' debian/rules
- dpkg-buildpackage -b -us -uc
- dpkg-buildpackage -j2 -b -us -uc
- cd ..
- ls -all
- pwd

View File

@@ -33,8 +33,7 @@ stages:
- rm -rf dtk-old-bundle
- ''
- 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" '
- sed -i 's/-j$(JOBS)/-j2/g' debian/rules
- dpkg-buildpackage -b -us -uc
- dpkg-buildpackage -j2 -b -us -uc
- cd ..
- ls -all
- pwd

2
debian/rules vendored
View File

@@ -24,7 +24,7 @@ override_dh_auto_configure:
-o $(CURDIR)/build/
override_dh_auto_build:
make -j$(JOBS) MAKEFLAGS="$(MAKEFLAGS)" -C $(CURDIR)/build
make MAKEFLAGS="$(MAKEFLAGS)" -C $(CURDIR)/build
override_dh_auto_install:
make -C $(CURDIR)/build install \