rpms
/
ghc-rpm-macros
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sync ghc-deps.sh with f20/epel7 

should allow building ghc-7.8 correctly
This commit is contained in:
Jens Petersen 2014-09-03 18:35:03 +09:00
parent 02cec2f46f
commit b463e9b898
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ghc-deps.sh
View File

@ -15,7 +15,10 @@ PKGBASEDIR=$2
PKGCONFDIR=$PKGBASEDIR/package.conf.d
GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
if [ -x "$PKGBASEDIR/ghc-pkg" ]; then
if [ -x "$PKGBASEDIR/bin/ghc-pkg" ]; then
# ghc-7.8
GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
elif [ -x "$PKGBASEDIR/ghc-pkg" ]; then
GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR"
else
GHC_PKG="/usr/bin/ghc-pkg-${GHC_VER}"
@ -34,7 +37,7 @@ fi
files=$(cat)
for i in $files; do
LIB_FILE=$(echo $i | grep /libHS | egrep -v "$PKGBASEDIR/libHS")
LIB_FILE=$(echo $i | grep /libHS | egrep -v "/libHSrts")
if [ "$LIB_FILE" ]; then
if [ -d "$PKGCONFDIR" ]; then
META=""

7
ghc-rpm-macros.spec
View File

@ -6,8 +6,8 @@
#%%global without_hscolour 1
Name: ghc-rpm-macros
Version: 0.98.7
Release: 3%{?dist}
Version: 0.98.8
Release: 1%{?dist}
Summary: RPM macros for building packages for GHC
License: GPLv3+
@ -80,6 +80,9 @@ EOF
%changelog
* Wed Sep 3 2014 Jens Petersen <petersen@redhat.com> - 0.98.8-1
- backport ghc-dep.sh support for ghc-pkg 7.8 from F20
* Sat Aug 2 2014 Jens Petersen <petersen@redhat.com> - 0.98.7-3
- provide ghc-rpm-macros-extra