rpms/pcc/F-10 pcc.spec,1.3,1.4 sources,1.2,1.3

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13804/F-10

Modified Files:
	pcc.spec sources 
Log Message:
Update to 20090816, adding support for x86_64. Use own configure script to avoid cross compilation.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-10/pcc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pcc.spec	13 Aug 2009 10:27:55 -0000	1.3
+++ pcc.spec	16 Aug 2009 09:53:16 -0000	1.4
@@ -3,24 +3,17 @@
  export CFLAGS="%{optflags}"; \
  export CXXFLAGS="%{optflags}"; \
  export FFLAGS="%{optflags} -I%{_fmoddir}"; \
- ./configure --program-prefix= --prefix=%{_prefix} \
- --exec-prefix=%{_prefix} --bindir=%{_bindir} \
- --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} --includedir=%{_includedir} \
- --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
- --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
- --mandir=%{_mandir} --infodir=%{_infodir}
+ ./configure --program-prefix= --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir}  --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
 
 # Used CVS snapshot
-%global snapshot 090813
+%global snapshot 090816
 
 Name:		pcc
 Version:	0.9.9
 Release:	0.4.%{snapshot}cvs%{?dist}
 Summary:	The Portable C Compiler
 Group:		Development/Languages
-License:	BSD and BSD with advertising and ISC 
+License:	BSD with advertising and BSD and ISC 
 URL:		http://pcc.ludd.ltu.se/
 Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
 Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
@@ -28,8 +21,8 @@ Source1:	http://pcc.ludd.ltu.se/ftp/pub/
 Patch0:		pcc-090808-optflags.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Currently only x86 supported both in ppc and ppc-libs
-ExclusiveArch:	%{ix86}
+# Currently only x86 and x86_64 supported both in ppc and ppc-libs
+ExclusiveArch:	%{ix86} x86_64
 BuildRequires:	bison flex
 Requires:	glibc-devel
 
@@ -60,13 +53,21 @@ mv pcc-libs-%{snapshot} pcc-libs
 
 %build
 export CFLAGS_NODEBUG=`echo %{optflags}|sed "s|-g||g"`
+# Set architecture directory needed for include flag
+%ifarch x86_64
+export archdir=amd64
+%endif
+%ifarch %{ix86}
+export archdir=i386
+%endif
+
 # First, build the library.
 cd pcc-libs
-%configure
-make CFLAGS="-I%{_arch} -I. %{optflags}" CFLAGS_NODEBUG="-I%{_arch} -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
+%pccconfigure
+make CFLAGS="-I${archdir} -Ilinux -I. %{optflags}" CFLAGS_NODEBUG="-I${archdir} -Ilinux -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
 cd ..
 # Then, build the compiler
-%configure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
+%pccconfigure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
  --with-libdir=%{_libdir} --with-incdir=%{_includedir}
 make %{?_smp_mflags}
 
@@ -79,8 +80,8 @@ make -C pcc-libs install DESTDIR=%{build
 make install DESTDIR=%{buildroot} strip=no
 # Fix man file perms
 chmod 644 %{buildroot}%{_mandir}/man1/*
-# Install symlink
-ln -sf %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
+# Rename cpp man page
+mv  %{buildroot}%{_mandir}/man1/{,pcc-}cpp.1
 # Directory for pcc-specific include files
 mkdir -p %{buildroot}%{_includedir}/pcc
 
@@ -94,13 +95,17 @@ rm -rf %{buildroot}
 %{_bindir}/pcc
 %{_libdir}/pcc/
 %{_includedir}/pcc/
-%{_libexecdir}/pcc-cpp
-%{_libexecdir}/pcc-ccom
-%{_mandir}/man1/pcc-ccom.1.*
+%{_libexecdir}/cpp
+%{_libexecdir}/ccom
+%{_mandir}/man1/ccom.1.*
 %{_mandir}/man1/pcc-cpp.1.*
 %{_mandir}/man1/pcc.1.*
 
 %changelog
+* Sun Aug 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.4.090816cvs
+- Update to 20090816, adding support for x86_64.
+- Use own configure macro to disable cross compilation.
+
 * Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs
 - Removed unneeded BR: byacc.
 - Update to 20090813.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 05:54:39 -0000	1.2
+++ sources	16 Aug 2009 09:53:16 -0000	1.3
@@ -1,2 +1,2 @@
-1ab38c96c30b04f97c8de5f113e7fb8f  pcc-090813.tgz
-b339afe4381e344011f9009c52458f8d  pcc-libs-090813.tgz
+2e98489a6f3fa699b19a2e08718d38d8  pcc-090816.tgz
+c44547b1f64051534820b61c4f38b284  pcc-libs-090816.tgz