SPECS (GCC_3_4): gcc.spec - more lang bconds and multilib files.
pluto
pluto at pld-linux.org
Tue Dec 13 11:43:01 CET 2005
Author: pluto Date: Tue Dec 13 10:43:01 2005 GMT
Module: SPECS Tag: GCC_3_4
---- Log message:
- more lang bconds and multilib files.
---- Files affected:
SPECS:
gcc.spec (1.278.2.4 -> 1.278.2.5)
---- Diffs:
================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.278.2.4 SPECS/gcc.spec:1.278.2.5
--- SPECS/gcc.spec:1.278.2.4 Fri Dec 9 04:32:38 2005
+++ SPECS/gcc.spec Tue Dec 13 11:42:56 2005
@@ -2,6 +2,8 @@
#
# Conditional build:
%bcond_without ada # build without ADA support
+%bcond_without cxx # build without C++ support
+%bcond_without fortran # build without Fortran support
%bcond_without java # build without Java support
%bcond_without objc # build without ObjC support
%bcond_with ssp # build with stack-smashing protector support
@@ -17,7 +19,7 @@
Summary(pt_BR): Coleçăo dos compiladores GNU: o compilador C e arquivos compartilhados
Name: gcc
Version: 3.4.5
-Release: 2
+Release: 2.1
Epoch: 5
License: GPL
Group: Development/Languages
@@ -66,7 +68,7 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _slibdir /%{_lib}
-%ifarch amd64 ppc64 s390x sparc64
+%ifarch %{x8664} ppc64 s390x sparc64
%define _slibdir32 /lib
%define _libdir32 /usr/lib
%endif
@@ -639,17 +641,6 @@
rm -rf obj-%{_target_platform} && install -d obj-%{_target_platform} && cd obj-%{_target_platform}
-CC="%{__cc}"
-
-%if %{with multilib}
-cat > gcc64 <<"EOF"
-#!/bin/sh
-exec /usr/bin/gcc -m64 "$@"
-EOF
-chmod +x gcc64
-CC=`pwd`/gcc64
-%endif
-
CFLAGS="%{rpmcflags}" \
CXXFLAGS="%{rpmcflags}" \
CC="$CC" \
@@ -663,7 +654,7 @@
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
- --enable-languages="c,c++,f77%{?with_objc:,objc}%{?with_ada:,ada}%{?with_java:,java}" \
+ --enable-languages="c%{?with_cxx:,c++}%{?with_fortran:,f77}%{?with_objc:,objc}%{?with_ada:,ada}%{?with_java:,java}" \
--enable-c99 \
--enable-long-long \
%ifnarch ppc
@@ -722,8 +713,10 @@
ln -sf gcc $RPM_BUILD_ROOT%{_bindir}/cc
echo ".so gcc.1" > $RPM_BUILD_ROOT%{_mandir}/man1/cc.1
+%if %{with fortran}
ln -sf g77 $RPM_BUILD_ROOT%{_bindir}/f77
echo ".so g77.1" > $RPM_BUILD_ROOT%{_mandir}/man1/f77.1
+%endif
%if %{with ada}
# move ada shared libraries to proper place...
@@ -754,11 +747,14 @@
%endif
# avoid -L poisoning in *.la - there should be only -L%{_libdir}/gcc/*/%{version}
-for f in libstdc++.la libsupc++.la %{?with_java:libgcj.la} ; do
+for f in %{?with_cxx:libstdc++.la libsupc++.la} %{?with_java:libgcj.la} ; do
perl -pi -e 's at -L[^ ]*[acs.] @@g' $RPM_BUILD_ROOT%{_libdir}/$f
done
# normalize libdir, to avoid propagation of unnecessary RPATHs by libtool
-for f in libstdc++.la libsupc++.la libg2c.la \
+
+for f in \
+ %{?with_cxx:libstdc++.la libsupc++.la} \
+ %{?with_fortran:libg2c.la} \
%{?with_java:libgcj.la lib-org-w3c-dom.la lib-org-xml-sax.la libffi.la} \
%{?with_objc:libobjc.la}; do
perl -pi -e "s@^libdir='.*@libdir='/usr/%{_lib}'@" $RPM_BUILD_ROOT%{_libdir}/$f
@@ -772,7 +768,9 @@
gccdir=$(echo $RPM_BUILD_ROOT%{_libdir}/gcc/*/*/)
mkdir $gccdir/tmp
# we have to save these however
-mv -f $gccdir/include/{%{?with_objc:objc,}g2c.h,syslimits.h%{?with_java:,libffi/ffitarget.h,gcj}} $gccdir/tmp
+for f in syslimits.h %{?with_fortran:g2c.h} %{?with_java:libffi/ffitarget.h gcj} %{?with_objc:objc}; do
+ mv -f $gccdir/include/$f $gccdir/tmp
+done
rm -rf $gccdir/include
mv -f $gccdir/tmp $gccdir/include
cp $gccdir/install-tools/include/*.h $gccdir/include
@@ -785,7 +783,9 @@
%endif
%find_lang %{name}
+%if %{with cxx}
%find_lang libstdc\+\+
+%endif
%if %{with ssp}
zcat %{SOURCE2} > $RPM_BUILD_ROOT%{_aclocaldir}/gcc_stack_protect.m4
@@ -793,6 +793,7 @@
# kill unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
+%{?with_multilib:rm -f $RPM_BUILD_ROOT%{_libdir}/32/libiberty.a}
rm -f $RPM_BUILD_ROOT%{_infodir}/dir*
rm -f $RPM_BUILD_ROOT%{_mandir}/man7/{fsf-funding,gfdl,gpl}*
@@ -886,7 +887,7 @@
%attr(755,root,root) %{_libdir}/gcc/*/*/collect2
%{_libdir}/gcc/*/*/include/*.h
-%exclude %{_libdir}/gcc/*/*/include/g2c.h
+%{?with_fortran:%exclude %{_libdir}/gcc/*/*/include/g2c.h}
%files -n libgcc
%defattr(644,root,root,755)
@@ -895,6 +896,7 @@
%attr(755,root,root) %{_slibdir32}/lib*.so.*
%endif
+%if %{with cxx}
%files c++
%defattr(644,root,root,755)
%doc gcc/cp/{ChangeLog,NEWS}
@@ -953,6 +955,7 @@
%if %{with multilib}
%{_libdir32}/libstdc++.a
%endif
+%endif
%if %{with objc}
%files objc
@@ -993,6 +996,7 @@
%endif
%endif
+%if %{with fortran}
%files g77
%defattr(644,root,root,755)
%doc gcc/f/{BUGS,ChangeLog,NEWS}
@@ -1039,6 +1043,7 @@
%if %{with multilib}
%{_libdir32}/libg2c.a
%endif
+%endif
%if %{with java}
%files java
@@ -1073,6 +1078,10 @@
%attr(755,root,root) %{_bindir}/addr2name.awk
%attr(755,root,root) %{_libdir}/lib*cj*.so.*.*.*
%attr(755,root,root) %{_libdir}/lib-org*.so.*.*.*
+%if %{with multilib}
+%attr(755,root,root) %{_libdir32}/lib*cj*.so.*.*.*
+%attr(755,root,root) %{_libdir32}/lib-org*.so.*.*.*
+%endif
%ifarch ppc
%attr(755,root,root) %{_libdir}/nof/lib*cj*.so.*
%endif
@@ -1091,10 +1100,16 @@
%dir %{_datadir}/java
%{_datadir}/java/libgcj*.jar
%{_libdir}/lib*cj.spec
-%{_libdir}/lib*cj*.la
%attr(755,root,root) %{_libdir}/lib*cj*.so
%attr(755,root,root) %{_libdir}/lib-org-*.so
+%{_libdir}/lib*cj*.la
%{_libdir}/lib-org-*.la
+%if %{with multilib}
+%attr(755,root,root) %{_libdir32}/lib*cj*.so
+%attr(755,root,root) %{_libdir32}/lib-org-*.so
+%{_libdir32}/lib*cj*.la
+%{_libdir32}/lib-org-*.la
+%endif
%ifarch ppc
%{_libdir}/nof/lib*cj*.la
%attr(755,root,root) %{_libdir}/nof/lib*cj*.so
@@ -1105,6 +1120,10 @@
%defattr(644,root,root,755)
%{_libdir}/lib*cj*.a
%{_libdir}/lib-org-*.a
+%if %{with multilib}
+%{_libdir32}/lib*cj*.a
+%{_libdir32}/lib-org-*.a
+%endif
%ifarch ppc
%{_libdir}/nof/lib*cj*.a
%endif
@@ -1113,17 +1132,23 @@
%defattr(644,root,root,755)
%doc libffi/{ChangeLog,ChangeLog.libgcj,LICENSE,README}
%attr(755,root,root) %{_libdir}/libffi-*.so
+%{?with_multilib:%attr(755,root,root) %{_libdir32}/libffi-*.so}
%files -n libffi-devel
%defattr(644,root,root,755)
%{_libdir}/gcc/*/*/include/ffitarget.h
%attr(755,root,root) %{_libdir}/libffi.so
%{_libdir}/libffi.la
+%if %{with multilib}
+%attr(755,root,root) %{_libdir32}/libffi.so
+%{_libdir32}/libffi.la
+%endif
%{_includedir}/ffi.h
%files -n libffi-static
%defattr(644,root,root,755)
%{_libdir}/libffi.a
+%{?with_multilib:%{_libdir32}/libffi.a}
%endif
%if %{with ada}
@@ -1163,6 +1188,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.278.2.5 2005/12/13 10:42:56 pluto
+- more lang bconds and multilib files.
+
Revision 1.278.2.4 2005/12/09 03:32:38 pluto
- more autodetecting c++ headers.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.278.2.4&r2=1.278.2.5&f=u
More information about the pld-cvs-commit
mailing list