From: Paweł Sikora <pluto@pld-linux.org>
Date: Thu, 6 Mar 2008 20:01:01 +0000 (+0000)
Subject: - fix gcc-4.2/4.3 version detection.
X-Git-Tag: auto/th/STLport-5_1_5-3~6
X-Git-Url: https://git.pld-linux.org/?p=packages%2FSTLport.git;a=commitdiff_plain;h=8ccfd16e4b5992f237a6ab202f3c9f192d0034fb

- fix gcc-4.2/4.3 version detection.

Changed files:
    STLport-vendor_gcc_detection.patch -> 1.1
    STLport.spec -> 1.93
---

diff --git a/STLport-vendor_gcc_detection.patch b/STLport-vendor_gcc_detection.patch
new file mode 100644
index 0000000..33300c9
--- /dev/null
+++ b/STLport-vendor_gcc_detection.patch
@@ -0,0 +1,17 @@
+this patch fixes gcc version detection for 4.2/4.3:
+
+version strings:
+gcc (GCC) 4.2.3 20080201 (release) (PLD-Linux)
+gcc (PLD-Linux) 4.3.0
+
+--- STLport-5.1.5/build/Makefiles/gmake/gcc.mak.orig	2008-03-06 20:36:20.000000000 +0100
++++ STLport-5.1.5/build/Makefiles/gmake/gcc.mak	2008-03-06 20:44:19.000000000 +0100
+@@ -26,7 +26,7 @@
+ else
+ 
+ ifneq ($(OSNAME), windows)
+-CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }')
++CXX_VERSION := $(shell ${CXX} --version | grep PLD | awk '{ print $$3; }')
+ 
+ ifeq ($(CXX_VERSION),)
+ # 2.95 report only version
diff --git a/STLport.spec b/STLport.spec
index 367906d..aa831e9 100644
--- a/STLport.spec
+++ b/STLport.spec
@@ -11,6 +11,7 @@ Source0:	http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-endianness.patch
 Patch1:		%{name}-alpha.patch
 Patch2:		%{name}-valarray-copy-constructor.patch
+Patch3:		%{name}-vendor_gcc_detection.patch
 URL:		http://stlport.sourceforge.net/
 BuildRequires:	libstdc++-devel >= 6:4.2.0-1
 BuildRequires:	sed >= 4.0
@@ -92,6 +93,7 @@ Statyczna wersja diagnostyczna biblioteki STLport.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak