diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2018-03-10 17:18:09 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2018-03-11 13:16:40 +0100 |
| commit | 55482fd99566f4a41099115d9c4984a1952c0000 (patch) | |
| tree | a7f18151fc07f2d001fa91fbd35f82ac3691262a /build/mixxx.py | |
| parent | 7ab6f3fa6f1367c0f3a70df4563257616ee751d8 (diff) | |
Apply build patches from rpmfusion github repo
https://github.com/rpmfusion/mixxx/blob/master/mixxx-2.1.0-build.patch
The reason for removing the -rpath option in depends.py is explained here:
https://bugzilla.rpmfusion.org/show_bug.cgi?id=3873#c7
Diffstat (limited to 'build/mixxx.py')
| -rw-r--r-- | build/mixxx.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/mixxx.py b/build/mixxx.py index b6662896cd..eab39565b9 100644 --- a/build/mixxx.py +++ b/build/mixxx.py @@ -174,7 +174,7 @@ class MixxxBuild(object): # Validate the specified qtdir exists if not os.path.isdir(qtdir): - logging.error("QT path does not exist or QT4 is not installed.") + logging.error("QT path (%s) does not exist or QT4 is not installed." % qtdir) logging.error( "Please specify your QT path by running 'scons qtdir=[path]'") Script.Exit(1) @@ -385,7 +385,7 @@ class MixxxBuild(object): if 'CC' in os.environ: self.env['CC'] = os.environ['CC'] if 'CFLAGS' in os.environ: - self.env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) + self.env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) if 'CXX' in os.environ: self.env['CXX'] = os.environ['CXX'] if 'CXXFLAGS' in os.environ: |