Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

attempt to fix Ubuntu package build #2361

Merged
merged 1 commit into from
Nov 17, 2019
Merged

attempt to fix Ubuntu package build #2361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ MIXXX_SCONS_FLAGS += install_root=$(CURDIR)/debian/tmp/usr
%:
dh $@ --parallel

# dh_auto_configure will attempt to run cmake instead of scons
# nothing needs to be done for the configure step; scons is run in the build step below
override_dh_auto_configure:
:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or should we try to explicitly specify the build system with dh_auto_configure --buildsystem scons (just guessed, not tested) instead of skipping this stage?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dh -l does not list scons as an automatically supported build system (at least when running it on Fedora 30). Otherwise, I think some of the other overrides in this file would be unnecessary.


override_dh_auto_build:
scons $(MIXXX_SCONS_FLAGS)
docbook-to-man debian/mixxx.sgml > mixxx.1
Expand Down