diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2020-05-13 17:26:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 17:26:45 +0200 |
| commit | 37ff6ba13d124a970fe72dccacc7d8ebad96a12d (patch) | |
| tree | 07b8cd1b337d8cdf18b82297d92ddbf32f3ddd8d | |
| parent | 1a2970ba2d7d0028a4c6f9de9e4b32c20e3b90e3 (diff) | |
| parent | 8732d9e7fdab5a65098fb6453a335ed224c66d05 (diff) | |
Merge pull request #2788 from daschuer/224_debfix
fix creation of debian packages for our 2.2.4 release.
| -rw-r--r--[-rwxr-xr-x] | build/debian/rules | 11 | ||||
| -rw-r--r-- | build/features.py | 9 | ||||
| -rw-r--r-- | lib/libshout/SConscript | 6 |
3 files changed, 19 insertions, 7 deletions
diff --git a/build/debian/rules b/build/debian/rules index f338090b7f..821c10d339 100755..100644 --- a/build/debian/rules +++ b/build/debian/rules @@ -6,15 +6,18 @@ DEB_BUILD_OPTIONS= noopt # Build flags are passed in from the SConscript. MIXXX_SCONS_FLAGS = "" +MIXXX_BUILD_FOLDER = "linux_build" # If ARCH is set to a different architecture when running pbuilder, pbuilder # will be set to create an environment to build packages for the architecture # specified in ARCH. ifneq (,$(findstring i386,$(ARCH))) - MIXXX_SCONS_FLAGS += machine=x86 + MIXXX_SCONS_FLAGS += machine=x86 + MIXXX_BUILD_FOLDER = "lin32_build" endif ifneq (,$(findstring amd64,$(ARCH))) - MIXXX_SCONS_FLAGS += machine=x86_64 + MIXXX_SCONS_FLAGS += machine=x86_64 + MIXXX_BUILD_FOLDER = "lin64_build" endif # parallel builds for scons @@ -35,9 +38,9 @@ override_dh_auto_build: override_dh_auto_clean: scons $(MIXXX_SCONS_FLAGS) -c || true - rm -rf .sconf_temp/ cache/ linux_build/ + rm -rf .sconf_temp/ cache/ $(MIXXX_BUILD_FOLDER)/ dh_clean .sconsign.dblite cachecustom.py \ - config.log src/build.h build/*.pyc mixxx.1 + config.log src/build.h build/*.pyc mixxx.1 lib/*/lib/*.a dh_auto_clean override_dh_auto_install: diff --git a/build/features.py b/build/features.py index a956202ffb..7d5c76249f 100644 --- a/build/features.py +++ b/build/features.py @@ -859,6 +859,7 @@ class LiveBroadcasting(Feature): # Clone our main environment so we don't change any settings in the # Mixxx environment libshout_env = build.env.Clone() + libshout_env['LIB_OUTPUT'] = '#lib/libshout/lib' if build.toolchain_is_gnu: libshout_env.Append(CCFLAGS='-pthread') @@ -870,10 +871,14 @@ class LiveBroadcasting(Feature): env = libshout_env SCons.Export('env') SCons.Export('build') - env.SConscript(env.File('SConscript', libshout_dir)) + env.SConscript( + env.File('SConscript', libshout_dir), + variant_dir="lib/libshout2", + duplicate=0, + exports=['build']) build.env.Append(CPPPATH="#lib/libshout/include") - build.env.Append(LIBPATH=libshout_dir) + build.env.Append(LIBPATH='#lib/libshout/lib') build.env.Append(LIBS=['shout_mixxx', 'ogg', 'vorbis', 'theora', 'speex', 'ssl', 'crypto']) depends.Qt.uic(build)('preferences/dialog/dlgprefbroadcastdlg.ui') diff --git a/lib/libshout/SConscript b/lib/libshout/SConscript index 7502884e09..9d415a2d39 100644 --- a/lib/libshout/SConscript +++ b/lib/libshout/SConscript @@ -32,4 +32,8 @@ env.Append(CPPDEFINES='HAVE_CONFIG_H') env.Append(CPPPATH='src/common') env.Append(CPPPATH='include') -env.StaticLibrary(target='libshout_mixxx', source=libshout_sources) +libshout_mixxx = env.StaticLibrary(target='libshout_mixxx', source=libshout_sources) + +# Install the libraries if needed. +if 'LIB_OUTPUT' in env.Dictionary(): + env.Install('$LIB_OUTPUT', source=[libshout_mixxx]) |