fixes for new upstream buildsystem
This commit is contained in:
parent
ac7d97bc0c
commit
6614c97958
@ -180,25 +180,16 @@ PATH=$HOME/.cabal/bin:$PATH
|
||||
%define cabal_configure_options --user
|
||||
|
||||
cd packages
|
||||
for i in $(egrep -v "^(%{?separate_packages})-" platform.packages); do
|
||||
for i in $(egrep -v "^(%{?separate_packages})-" ../etc/build.packages); do
|
||||
name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
|
||||
ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/")
|
||||
cd $name-$ver
|
||||
case $name in
|
||||
alex|cabal-install|happy)
|
||||
%ghc_bin_build
|
||||
;;
|
||||
haskell-platform)
|
||||
%ghc_lib_build_without_haddock $name $ver
|
||||
cabal_configure_extra_options=
|
||||
;;
|
||||
*)
|
||||
%ghc_lib_build $name $ver
|
||||
./Setup register --inplace
|
||||
;;
|
||||
esac
|
||||
cd ..
|
||||
done
|
||||
cd ..
|
||||
%ghc_lib_build haskell-platform %{version}
|
||||
|
||||
|
||||
%install
|
||||
@ -206,27 +197,20 @@ HOME=$PWD
|
||||
PATH=$HOME/.cabal/bin:$PATH
|
||||
|
||||
cd packages
|
||||
|
||||
for i in $(egrep -v "^(%{?separate_packages})-" platform.packages); do
|
||||
for i in $(egrep -v "^(%{?separate_packages})-" ../etc/build.packages); do
|
||||
name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
|
||||
ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/")
|
||||
cd $name-$ver
|
||||
case $name in
|
||||
alex|cabal-install|happy)
|
||||
%ghc_bin_install $name $ver
|
||||
;;
|
||||
*)
|
||||
%ghc_lib_install $name $ver
|
||||
# for ghc-7.8
|
||||
#%%ghc_gen_filelists $name $ver
|
||||
echo "%doc packages/$name-$ver/LICENSE" >> ghc-$name.files
|
||||
;;
|
||||
esac
|
||||
cd ..
|
||||
done
|
||||
|
||||
mv */*.files ..
|
||||
cd ..
|
||||
%ghc_lib_install
|
||||
|
||||
%ghc_strip_dynlinked
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user