rpms/adobe-source-libraries
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updating for new GCC in F19

Browse source
This commit is contained in:
Alec Leamas 2013-02-16 17:10:53 +01:00
commit 57a0aaced6
2 changed files with 49 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
adobe-source-libraries.spec
View file

@ -1,6 +1,6 @@
Name: adobe-source-libraries
Version: 1.0.43
Release: 14%{?dist}
Release: 15%{?dist}
Summary: General purpose C++ libraries
Group: System Environment/Libraries
@ -21,6 +21,7 @@ Patch2: asl-no-concept-check1043.patch
# https://svn.boost.org/trac/boost/ticket/6940
Patch3: asl-time-utc.patch
Patch4: asl-boost-1.50.patch
Patch5: asl-C11.patch
BuildRequires: boost-build
BuildRequires: boost-devel
@ -62,6 +63,7 @@ API and other documentation for Adobe Source Libraries (ASL).
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
find . \( -name *.hpp -o -name *.jpg \) -executable -exec chmod 644 {} \;
iconv -f iso8859-1 -t utf-8 release_notes.txt > release_notes.txt.conv && \
@ -70,7 +72,7 @@ chmod 644 LICENSE_1_0_0.txt
sed -i 's/@optflags@/%{optflags}/g' jamroot.jam
sed -i 's/@version@/%{version}/g' %{SOURCE1}
mv boost-build.jam boost-build.nojam
mv boost-build.jam boost-build.nojam
%build
@ -137,6 +139,9 @@ ln -sf $sofile ${sofile%%.*.*.*}
%changelog
* Sat Feb 16 2013 Alec Leamas <leamas@nowhere.net> - 1.0.43-15
- Patching for new gcc version (C11 compatibility).
* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.0.43-14
- Rebuild for Boost-1.53.0

42
asl-C11.patch Normal file
View file

@ -0,0 +1,42 @@
diff --git a/adobe/cmath.hpp b/adobe/cmath.hpp
index 733c299..e671f7c 100644
--- a/adobe/cmath.hpp
+++ b/adobe/cmath.hpp
@@ -37,18 +37,9 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
#define ADOBE_HAS_CPP_CMATH
#elif __GNUC__ == 4
-#if (__GNUC_MINOR__ <= 7) || (!(defined(_GLIBCXX_USE_C99_MATH_TR1)))
-// at least Ubuntu 9.x, gcc 4.4.1, still falls into this case
-/*
- The currently supported version of GNUC has C99 extensions in math.h. But no TR1 extensions.
-*/
-#define ADOBE_HAS_C99_MATH_H
-#include <cmath>
-#else
-#include <tr1/cmath>
#define ADOBE_HAS_C99_STD_MATH_H
-#endif
+#include <tr1/cmath>
#endif
#elif defined(_MSC_VER)
@@ -73,12 +64,12 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
namespace adobe {
-using std::float_t;
-using std::double_t;
+using std::tr1::float_t;
+using std::tr1::double_t;
-using std::round;
-using std::lround;
-using std::trunc;
+using std::tr1::round;
+using std::tr1::lround;
+using std::tr1::trunc;
} // namespace adobe