rpms/libstdc++so7/FC-5 libstdc++7.spec,1.3,1.4

[fedora-cvs-commits at redhat.com]

Author: petersen

Update of /cvs/dist/rpms/libstdc++so7/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13669

Modified Files:
	libstdc++7.spec 
Log Message:
- use ppc64 as target for ppc like gcc does (#188446)
  - define and use gcc_target_platform from gcc41.spec



Index: libstdc++7.spec
===================================================================
RCS file: /cvs/dist/rpms/libstdc++so7/FC-5/libstdc++7.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libstdc++7.spec	10 Mar 2006 06:02:33 -0000	1.3
+++ libstdc++7.spec	24 Apr 2006 09:36:44 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: libstdc++.so.7 preview
 Name: libstdc++so7
 Version: 4.2.0
-Release: 0.3.%{datestamp}.2
+Release: 0.3.%{datestamp}.3
 License: GPL
 Group: System Environment/Libraries
 Source0: gcc_stub-4.1-20060118.tar.bz2
@@ -15,6 +15,15 @@
 AutoReq: true
 
 %define _gnu %{nil}
+%ifarch sparc
+%define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
+%endif
+%ifarch ppc
+%define gcc_target_platform ppc64-%{_vendor}-%{_target_os}
+%endif
+%ifnarch sparc ppc
+%define gcc_target_platform %{_target_platform}
+%endif
 
 %description
 The libstdc++so7 package contains a preview of the GNU Standard C++
@@ -46,7 +55,7 @@
 mkdir obj
 cd obj
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ../configure \
-  --enable-languages=c,c++ --disable-multilib %{_target_platform}
+  --enable-languages=c,c++ --disable-multilib %{gcc_target_platform}
 mkdir gcc
 cp -a ../copy_to_gcc/* gcc/
 gccdir=`cd $(gcc $RPM_OPT_FLAGS -print-file-name=include)/..; pwd`
@@ -84,10 +93,10 @@
   $RPM_BUILD_ROOT%{_libdir}/libstdc++-%{datestamp}.so.7
 
 # links for shared library
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{_target_platform}/$libversion
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/$libversion
 mv $RPM_BUILD_ROOT%{_libdir}/*.a \
-  $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{_target_platform}/$libversion/
-pushd $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{_target_platform}/$libversion/
+  $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/$libversion/
+pushd $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/$libversion/
 if [ "%{_lib}" = lib64 ]; then
   ln -sf ../../../../lib64/libstdc++*.so.7 libstdc++.so
 else
@@ -142,7 +151,7 @@
 esac
 %endif
 %ifnarch %{ix86} x86_64 ppc ppc64 s390 s390x sparc sparc64
-T=%{_target_platform}
+T=%{gcc_target_platform}
 %endif
 exec /usr/bin/g++ \
      -D__FLT_HAS_DENORM__=__FLT_DENORM_MIN__ \
@@ -171,10 +180,14 @@
 %files devel
 %{_prefix}/bin/g++-libstdc++-so_7
 %dir %{_prefix}/lib/gcc
-%{_prefix}/lib/gcc/%{_target_platform}/4.2.0-*
+%{_prefix}/lib/gcc/%{gcc_target_platform}/4.2.0-*
 %{_prefix}/include/c++/4.2.0-*
 
 %changelog
+* Mon Apr 24 2006 Jens Petersen <petersen at redhat.com> - 4.2.0-0.3.20060203.3
+- use ppc64 as target for ppc like gcc does (#188446)
+  - define and use gcc_target_platform from gcc41.spec
+
 * Fri Mar 10 2006 Bill Nottingham <notting at redhat.com> - 4.2.0-0.3.20060203.2
 - rebuild for ppc TLS issue (#184446)