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

update ghc-deps.sh for rts changes as of ghc-7.7.20130828

Browse Source 
ghc-7.8 rts now lives in its own subdir
This commit is contained in:
Jens Petersen 2013-09-07 22:08:03 +09:00
parent c7830b0a64
commit a2f7c2b71a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghc-deps.sh
View File

@ -36,7 +36,7 @@ files=$(cat)
#set -x #set -x
for i in $files; do 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 [ "$LIB_FILE" ]; then
if [ -d "$PKGCONFDIR" ]; then if [ -d "$PKGCONFDIR" ]; then
META="" META=""
@ -68,7 +68,7 @@ for i in $files; do
fi fi
elif [ "$MODE" = "--requires" ]; then elif [ "$MODE" = "--requires" ]; then
if file $i | grep -q 'executable, .* dynamically linked'; then if file $i | grep -q 'executable, .* dynamically linked'; then
BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so =.*%\1%") BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so => .*%\1%")
if [ -d "$PKGCONFDIR" ]; then if [ -d "$PKGCONFDIR" ]; then
PACKAGE_CONF_OPT="--package-conf=$PKGCONFDIR" PACKAGE_CONF_OPT="--package-conf=$PKGCONFDIR"
fi fi

5
ghc-rpm-macros.spec
View File

@ -6,7 +6,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.0.8 Version: 1.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building packages for GHC Summary: RPM macros for building packages for GHC
@ -90,6 +90,9 @@ EOF
%changelog %changelog
* Sat Sep 7 2013 Jens Petersen <petersen@redhat.com> - 1.1-1
- update ghc-deps.sh to handling ghc-7.8 rts
* Tue Aug 27 2013 Jens Petersen <petersen@redhat.com> - 1.0.8-1 * Tue Aug 27 2013 Jens Petersen <petersen@redhat.com> - 1.0.8-1
- drop ghc_docdir in favor of _pkgdocdir - drop ghc_docdir in favor of _pkgdocdir
- no longer version package htmldirs - no longer version package htmldirs