New upstream version.
- Drop no longer needed custom SConstruct file and use new upstream SONAME.
This commit is contained in:
parent
ceafb08555
commit
5351f203cb
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/double-conversion-2.0.0.tar.gz
|
||||
/double-conversion-2.0.1.tar.gz
|
||||
|
||||
40
SConstruct
40
SConstruct
@ -1,40 +0,0 @@
|
||||
# vim:ft=python
|
||||
import os
|
||||
|
||||
double_conversion_sources = ['src/' + x for x in SConscript('src/SConscript')]
|
||||
double_conversion_test_sources = ['test/cctest/' + x for x in SConscript('test/cctest/SConscript')]
|
||||
test = double_conversion_sources + double_conversion_test_sources
|
||||
print(test)
|
||||
|
||||
DESTDIR = ARGUMENTS.get('DESTDIR', '')
|
||||
prefix = ARGUMENTS.get('prefix', '/usr/local')
|
||||
lib = ARGUMENTS.get('libsuffix', 'lib')
|
||||
libdir = os.path.join(DESTDIR + prefix, lib)
|
||||
|
||||
env = Environment(CPPPATH='#/src', LIBS=['m', 'stdc++'], CXXFLAGS=ARGUMENTS.get('CXXFLAGS', ''))
|
||||
debug = ARGUMENTS.get('debug', 0)
|
||||
optimize = ARGUMENTS.get('optimize', 0)
|
||||
env.Replace(CXX = ARGUMENTS.get('CXX', 'g++'))
|
||||
|
||||
# for shared lib, requires scons 2.3.0
|
||||
env['SHLIBVERSION'] = ARGUMENTS.get('VERSION', '')
|
||||
|
||||
print double_conversion_sources
|
||||
print double_conversion_test_sources
|
||||
double_conversion_shared_objects = [
|
||||
env.SharedObject(src) for src in double_conversion_sources]
|
||||
double_conversion_static_objects = [
|
||||
env.StaticObject(src) for src in double_conversion_sources]
|
||||
|
||||
library_name = 'double-conversion'
|
||||
|
||||
static_lib = env.StaticLibrary(library_name, double_conversion_static_objects)
|
||||
static_lib_pic = env.StaticLibrary(library_name + '_pic', double_conversion_shared_objects)
|
||||
shared_lib = env.SharedLibrary(library_name, double_conversion_shared_objects)
|
||||
|
||||
env.Program('run_tests', double_conversion_test_sources, LIBS=[static_lib])
|
||||
|
||||
env.Alias('install-shared', env.InstallVersionedLib(libdir, shared_lib))
|
||||
env.Alias('install-static', env.Install(libdir, static_lib))
|
||||
env.Alias('install-static', env.Install(libdir, static_lib_pic))
|
||||
Alias('install', ['install-shared', 'install-static'])
|
||||
@ -2,14 +2,11 @@
|
||||
|
||||
Summary: Library providing binary-decimal and decimal-binary routines for IEEE doubles
|
||||
Name: double-conversion
|
||||
Version: 2.0.0
|
||||
Release: 4%{?dist}
|
||||
Version: 2.0.1
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Group: Development/Libraries
|
||||
Source0: http://double-conversion.googlecode.com/files/%{name}-%{version}.tar.gz
|
||||
# Currently needed to build a shared library with required options, filed upstream as
|
||||
# http://code.google.com/p/double-conversion/issues/detail?id=42
|
||||
Source1: SConstruct
|
||||
URL: http://code.google.com/p/double-conversion
|
||||
BuildRequires: scons >= 2.3.0
|
||||
|
||||
@ -41,7 +38,6 @@ Static %{name} library.
|
||||
|
||||
%prep
|
||||
%setup -q -c %{name}-%{version}
|
||||
cp -p %{SOURCE1} SConstruct
|
||||
|
||||
%build
|
||||
scons %{?_smp_mflags} \
|
||||
@ -65,8 +61,7 @@ scons %{target} \
|
||||
CXXFLAGS="%{optflags}" \
|
||||
libsuffix=%{_lib} \
|
||||
prefix=%{_prefix} \
|
||||
DESTDIR=%{buildroot} \
|
||||
VERSION="%{version}"
|
||||
DESTDIR=%{buildroot}
|
||||
|
||||
cp -p src/*.h %{buildroot}%{_includedir}/%{name}
|
||||
|
||||
@ -79,7 +74,7 @@ scons CXXFLAGS="%{optflags}" run_tests
|
||||
|
||||
%files
|
||||
%doc LICENSE README AUTHORS Changelog
|
||||
%{_libdir}/libdouble-conversion.so.2*
|
||||
%{_libdir}/libdouble-conversion.so.1*
|
||||
|
||||
%files devel
|
||||
%{_libdir}/libdouble-conversion.so
|
||||
@ -92,6 +87,10 @@ scons CXXFLAGS="%{optflags}" run_tests
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Feb 8 2014 Milan Bouchet-Valat <nalimilan@club.fr> - 2.0.1-1
|
||||
- New upstream version.
|
||||
- Drop no longer needed custom SConstruct file and use new upstream SONAME.
|
||||
|
||||
* Tue Dec 17 2013 Milan Bouchet-Valat <nalimilan@club.fr> - 2.0.0-4
|
||||
- Drop libstdc++-devel from BuildRequires.
|
||||
- Move %%check after %%install.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user