for ghc-7.6 use --global-package-db and --no-user-package-db
This commit is contained in:
parent
73b0bd180f
commit
6910d07de7
@ -14,7 +14,7 @@ PKGCONFDIR=$PKGBASEDIR/package.conf.d
|
|||||||
GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
|
GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
|
||||||
|
|
||||||
if [ ! -x "/usr/bin/ghc-pkg-${GHC_VER}" -a -x "$PKGBASEDIR/ghc-pkg" ]; then
|
if [ ! -x "/usr/bin/ghc-pkg-${GHC_VER}" -a -x "$PKGBASEDIR/ghc-pkg" ]; then
|
||||||
GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR"
|
GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR"
|
||||||
else
|
else
|
||||||
GHC_PKG="/usr/bin/ghc-pkg"
|
GHC_PKG="/usr/bin/ghc-pkg"
|
||||||
fi
|
fi
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# see https://fedoraproject.org/wiki/Packaging:Haskell for more details
|
# see https://fedoraproject.org/wiki/Packaging:Haskell for more details
|
||||||
|
|
||||||
# "cabal"
|
# "cabal"
|
||||||
%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-conf} %{!?ghc_without_dynamic:-dynamic} Setup\
|
%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:--no-user-package-db} %{!?ghc_without_dynamic:-dynamic} Setup\
|
||||||
./Setup
|
./Setup
|
||||||
|
|
||||||
# check ghc version was rebuilt against self
|
# check ghc version was rebuilt against self
|
||||||
@ -83,7 +83,7 @@ Requires(post): ghc-compiler = %{ghc_version}\
|
|||||||
Requires(postun): ghc-compiler = %{ghc_version}\
|
Requires(postun): ghc-compiler = %{ghc_version}\
|
||||||
Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}
|
Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}
|
||||||
|
|
||||||
%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-conf || :
|
%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-db || :
|
||||||
|
|
||||||
# ghc_strip_dynlinked
|
# ghc_strip_dynlinked
|
||||||
%ghc_strip_dynlinked\
|
%ghc_strip_dynlinked\
|
||||||
|
@ -96,6 +96,8 @@ EOF
|
|||||||
- move spec section metamacros and multiple library packaging macros still
|
- move spec section metamacros and multiple library packaging macros still
|
||||||
needed for ghc and haskell-platform to new extra subpackage
|
needed for ghc and haskell-platform to new extra subpackage
|
||||||
- drop ghc_add_basepkg_file macro and ghc_exclude_docdir
|
- drop ghc_add_basepkg_file macro and ghc_exclude_docdir
|
||||||
|
- for ghc-7.6 --global-package-db replaces --global-conf and
|
||||||
|
--no-user-package-db deprecates --no-user-package-conf
|
||||||
|
|
||||||
* Wed Mar 20 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.98.1-4
|
* Wed Mar 20 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.98.1-4
|
||||||
- Remove %%config from %%{_sysconfdir}/rpm/macros.*
|
- Remove %%config from %%{_sysconfdir}/rpm/macros.*
|
||||||
|
Loading…
Reference in New Issue
Block a user