specify /usr/bin/gcc to help bootstrapping; drop redundant posttrans scriplet
This commit is contained in:
parent
b03062c00b
commit
c5a50faad5
18
ghc.spec
18
ghc.spec
@ -45,7 +45,7 @@ Version: 7.0.2
|
||||
# - release can only be reset if all library versions get bumped simultaneously
|
||||
# (eg for a major release)
|
||||
# - minor release numbers should be incremented monotonically
|
||||
Release: 20%{?dist}
|
||||
Release: 21%{?dist}
|
||||
Summary: Glasgow Haskell Compilation system
|
||||
# fedora ghc has only been bootstrapped on the following archs:
|
||||
ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64
|
||||
@ -224,18 +224,17 @@ EOF
|
||||
autoreconf
|
||||
%endif
|
||||
export CFLAGS="${CFLAGS:-%optflags}"
|
||||
# specify gcc to avoid problems when bootstrapping with ccache
|
||||
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
|
||||
--bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
|
||||
--datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
|
||||
--libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
|
||||
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
|
||||
%ifarch ppc64
|
||||
--with-gcc=/usr/bin/gcc
|
||||
%endif
|
||||
--with-gcc=%{_bindir}/gcc \
|
||||
%{!?ghc_without_shared:--enable-shared}
|
||||
|
||||
# >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
|
||||
make -j$RPM_BUILD_NCPUS
|
||||
|
||||
@ -342,10 +341,6 @@ if [ "$1" = 0 ]; then
|
||||
update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc
|
||||
fi
|
||||
|
||||
%posttrans
|
||||
# (posttrans to make sure any old libs and docs have been removed first)
|
||||
%ghc_pkg_recache
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc ANNOUNCE HACKING LICENSE README
|
||||
@ -406,6 +401,11 @@ fi
|
||||
%endif
|
||||
|
||||
%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
|
||||
- make devel and prof meta packages require libs with release
|
||||
- make ghc-*-devel subpackages require ghc with release
|
||||
|
Loading…
Reference in New Issue
Block a user