SPECS (AC-branch): gcc.spec - multilib may require different c++co...

[qboosh]

Author: qboosh                       Date: Mon Dec 12 21:25:45 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- multilib may require different c++config.h files (affected <cmath> on sparc64

---- Files affected:
SPECS:
   gcc.spec (1.241.2.27 -> 1.241.2.28) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.241.2.27 SPECS/gcc.spec:1.241.2.28
--- SPECS/gcc.spec:1.241.2.27	Mon Dec 12 22:02:42 2005
+++ SPECS/gcc.spec	Mon Dec 12 22:25:33 2005
@@ -1432,6 +1432,23 @@
 %if %{with multilib}
 ln -sf %{_slibdir}/libgcc_s.so.1 $gccdir/libgcc_s.so
 ln -sf %{_slibdir32}/libgcc_s.so.1 $gccdir/libgcc_s_32.so
+
+%if %{with c++}
+spath=objc-%{_target_platform}/%{_target_platform}
+sfile=libstdc++-v3/include/%{_target_platform}/bits/c++config.h
+dpath=$RPM_BUILD_ROOT%{_includedir}/c++/%{GCC_VERSION}/%{_target_platform}/bits
+if ! cmp $spath/$sfile $spath/32/$sfile > /dev/null ; then
+	cp -f $spath/$sfile $dpath/c++config64.h
+	cp -f 32/$spath/$sfile $dpath/c++config32.h
+	cat > $dpath/c++config.h <<EOF
+#include <bits/wordsize.h>
+#if __WORDSIZE == 32
+#include <bits/c++config32.h>
+#else
+#include <bits/c++config64.h>
+#endif
+EOF
+%endif
 %endif
 
 %find_lang %{name}
@@ -1911,6 +1928,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.241.2.28  2005/12/12 21:25:33  qboosh
+- multilib may require different c++config.h files (affected <cmath> on sparc64
+
 Revision 1.241.2.27  2005/12/12 21:02:42  qboosh
 - added --enable-symvers=gnu as hack to generate libstdc++32 compatible with
   32-bit libstdc++
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.241.2.27&r2=1.241.2.28&f=u