Author: ulatekh Update of /cvs/free/rpms/mixxx/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26558/F-18 Modified Files: mixxx.spec Added Files: mixxx-1.11.0-installpath.patch Log Message: Another version of 1.11.0 whose 64-bit build works mixxx-1.11.0-installpath.patch: build/mixxx.py | 10 +++++++++- src/SConscript | 9 ++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) --- NEW FILE mixxx-1.11.0-installpath.patch --- --- mixxx/build/mixxx.py 2012-09-05 05:35:20 +0000 +++ mixxx/build/mixxx.py 2013-05-26 16:19:35 +0000 @@ -219,7 +219,7 @@ if os.environ.has_key('CC'): self.env['CC'] = os.environ['CC'] if os.environ.has_key('CFLAGS'): - self.env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) + self.env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) if os.environ.has_key('CXX'): self.env['CXX'] = os.environ['CXX'] if os.environ.has_key('CXXFLAGS'): @@ -227,6 +227,14 @@ if os.environ.has_key('LDFLAGS'): self.env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + # Allow installation directories to be specified. + if os.environ.has_key('LIBDIR'): + self.env['LIBDIR'] = os.environ['LIBDIR'] + if os.environ.has_key('BINDIR'): + self.env['BINDIR'] = os.environ['BINDIR'] + if os.environ.has_key('SHAREDIR'): + self.env['SHAREDIR'] = os.environ['SHAREDIR'] + # Initialize this as a list, fixes a bug where first CPPDEFINE would get # mangled self.env['CPPDEFINES'] = [] --- mixxx/src/SConscript 2013-04-27 04:04:25 +0000 +++ mixxx/src/SConscript 2013-05-26 16:56:32 +0000 @@ -247,9 +247,12 @@ #the compiled-in strings using /usr as the prefix. That's why we have install_root and flags['prefix']. install_root = ARGUMENTS.get('install_root', flags['prefix']) print "Install root: " + install_root - unix_share_path = os.path.join(install_root, 'share') - unix_bin_path = os.path.join(install_root, 'bin') - unix_lib_path = os.path.join(install_root, 'lib') + unix_share_path = env.get('SHAREDIR', + default=os.path.join(install_root, 'share')) + unix_bin_path = env.get('BINDIR', + default=os.path.join(install_root, 'bin')) + unix_lib_path = env.get('LIBDIR', + default=os.path.join(install_root, 'lib')) binary = env.Install(unix_bin_path, binary_files) resource = env.Install(os.path.join(unix_share_path, 'mixxx'), resource_files) Index: mixxx.spec =================================================================== RCS file: /cvs/free/rpms/mixxx/F-18/mixxx.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mixxx.spec 23 May 2013 01:12:44 -0000 1.15 +++ mixxx.spec 26 May 2013 20:32:45 -0000 1.16 @@ -8,6 +8,7 @@ URL: http://www.mixxx.org Source0: http://downloads.mixxx.org/mixxx-%{version}/%{name}-%{version}-src.tar.gz Patch0: %{name}-%{version}-20130517bzr.patch +Patch1: %{name}-%{version}-installpath.patch # Updated manual...build it yourself with: # 1) bzr checkout lp:~mixxxdevelopers/mixxx/manual-1.11.x # 2) cd manual-1.11.x; make html; make latexpdf; make latexpdf @@ -61,6 +62,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %setup -T -D -a 1 # Fix file permissions. (Already fixed upstream.) @@ -77,7 +79,7 @@ %build export CFLAGS=$RPM_OPT_FLAGS -export CXXFLAGS=$RPM_OPT_FLAGS +export LIBDIR=$RPM_BUILD_ROOT/%{_libdir} scons %{?_smp_mflags} \ prefix=%{_prefix} \ qtdir=%{_qt4_prefix} \ @@ -90,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT export CFLAGS=$RPM_OPT_FLAGS -export CXXFLAGS=$RPM_OPT_FLAGS +export LIBDIR=$RPM_BUILD_ROOT/%{_libdir} scons %{?_smp_mflags} \ install_root=$RPM_BUILD_ROOT%{_prefix} \ qtdir=%{_qt4_prefix} \