rpms/ghc
5
0
Fork 0
Code Issues Pull Requests Releases Activity

specify /usr/bin/gcc to help bootstrapping; drop redundant posttrans scriplet

Browse Source
This commit is contained in:
Jens Petersen 2011-05-11 11:46:06 +09:00
parent b03062c00b
commit c5a50faad5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ghc.spec
View File

@ -45,7 +45,7 @@ Version: 7.0.2
# - release can only be reset if all library versions get bumped simultaneously # - release can only be reset if all library versions get bumped simultaneously
# (eg for a major release) # (eg for a major release)
# - minor release numbers should be incremented monotonically # - minor release numbers should be incremented monotonically
Release: 20%{?dist} Release: 21%{?dist}
Summary: Glasgow Haskell Compilation system Summary: Glasgow Haskell Compilation system
# fedora ghc has only been bootstrapped on the following archs: # fedora ghc has only been bootstrapped on the following archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64
@ -224,18 +224,17 @@ EOF
autoreconf autoreconf
%endif %endif
export CFLAGS="${CFLAGS:-%optflags}" export CFLAGS="${CFLAGS:-%optflags}"
# specify gcc to avoid problems when bootstrapping with ccache
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
--bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \ --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
--libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \ --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
%ifarch ppc64 --with-gcc=%{_bindir}/gcc \
--with-gcc=/usr/bin/gcc
%endif
%{!?ghc_without_shared:--enable-shared} %{!?ghc_without_shared:--enable-shared}
# >4 cpus tends to break build # >4 cpus tends to break build
[ -z "$RPM_BUILD_NCPUS" ] && RPM_BUILD_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN) [ -z "$RPM_BUILD_NCPUS" ] && RPM_BUILD_NCPUS=$(%{_bindir}/getconf _NPROCESSORS_ONLN)
[ "$RPM_BUILD_NCPUS" -gt 4 ] && RPM_BUILD_NCPUS=4 [ "$RPM_BUILD_NCPUS" -gt 4 ] && RPM_BUILD_NCPUS=4
make -j$RPM_BUILD_NCPUS make -j$RPM_BUILD_NCPUS
@ -342,10 +341,6 @@ if [ "$1" = 0 ]; then
update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc
fi fi
%posttrans
# (posttrans to make sure any old libs and docs have been removed first)
%ghc_pkg_recache
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ANNOUNCE HACKING LICENSE README %doc ANNOUNCE HACKING LICENSE README
@ -406,6 +401,11 @@ fi
%endif %endif
%changelog %changelog
* Wed May 11 2011 Jens Petersen <petersen@redhat.com> - 7.0.2-21
- configure with /usr/bin/gcc to help bootstrapping to new archs
(otherwise ccache tends to get hardcoded as gcc, which not in koji)
- posttrans scriplet for ghc_pkg_recache is redundant
* Mon May 9 2011 Jens Petersen <petersen@redhat.com> - 7.0.2-20 * Mon May 9 2011 Jens Petersen <petersen@redhat.com> - 7.0.2-20
- make devel and prof meta packages require libs with release - make devel and prof meta packages require libs with release
- make ghc-*-devel subpackages require ghc with release - make ghc-*-devel subpackages require ghc with release