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

use ghcliblib/ghclibplatform paths for Hadrian dependency generation

Browse Source
This commit is contained in:
Jens Petersen 2021-12-18 23:29:58 +08:00
parent 839272fa3a
commit ac98514a64
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghc-deps.sh
View File

@ -1,15 +1,15 @@
#!/bin/sh #!/bin/sh
# find rpm provides and requires for Haskell GHC libraries # find rpm provides and requires for Haskell GHC libraries
[ $# -lt 2 ] && echo "Usage: $(basename $0) [--provides|--requires] %{buildroot}%{ghclibdir} [%{?ghc_name}]" && exit 1 [ $# -lt 2 ] && echo "Usage: $(basename $0) [--provides|--requires] %{buildroot}%{ghcliblib} [%{?ghc_name}]" && exit 1
set +x set +x
MODE=$1 MODE=$1
PKGBASEDIR=$2 PKGBASEDIR=$2
if [ -z "$3" -o "$3" = "ghc" ]; if [ -z "$3" ];
then GHCPREFIX=ghc then GHCPREFIX=ghc
else GHCPREFIX=$(basename $PKGBASEDIR) else GHCPREFIX=$3
fi fi
PKGCONFDIR=$PKGBASEDIR/package.conf.d PKGCONFDIR=$PKGBASEDIR/package.conf.d

7
ghc-pkg-wrapper
View File

@ -1,13 +1,16 @@
#!/bin/sh #!/bin/sh
[ $# -lt 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghclibdir} ..." && exit 1 [ $# -lt 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghcliblib} ..." && exit 1
set +x set +x
PKGBASEDIR=$1 PKGBASEDIR=$1
shift shift
PKGCONFDIR=$PKGBASEDIR/package.conf.d PKGCONFDIR=$PKGBASEDIR/package.conf.d
GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//) case $(basename "$PKGBASEDIR") in
lib) GHC_VER=$(basename $(dirname $PKGBASEDIR) | sed -e s/ghc-//) ;;
*) GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//) ;;
esac
# for a ghc build use the new ghc-pkg # for a ghc build use the new ghc-pkg
INPLACE_GHCPKG=$PKGBASEDIR/../../bin/ghc-pkg-$GHC_VER INPLACE_GHCPKG=$PKGBASEDIR/../../bin/ghc-pkg-$GHC_VER

1
ghc-rpm-macros.spec
View File

@ -186,6 +186,7 @@ EOF
%changelog %changelog
* Sat Dec 18 2021 Jens Petersen <petersen@redhat.com> - 2.3.2-1 * Sat Dec 18 2021 Jens Petersen <petersen@redhat.com> - 2.3.2-1
- Cabal uses ppc64 in paths for ppc64le - Cabal uses ppc64 in paths for ppc64le
- fix ghc-deps.sh dependency generation for Hadrian
* Fri Dec 17 2021 Jens Petersen <petersen@redhat.com> - 2.3.1-1 * Fri Dec 17 2021 Jens Petersen <petersen@redhat.com> - 2.3.1-1
- ghc_gen_filelists: support ghc Hadrian install - ghc_gen_filelists: support ghc Hadrian install

6
ghc.attr
View File

@ -1,3 +1,3 @@
%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir} %{?ghc_name} %__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghcliblib} %{?ghc_name:ghc-%{ghc_version}}
%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} %{?ghc_name} %__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghcliblib} %{?ghc_name:ghc-%{ghc_version}}
%__ghc_path ^%{ghclibdir}/(.*/libHS.*_p\.a|package.conf.d/.*\.conf)$ %__ghc_path ^(%{ghcliblib}/package.conf.d/.*\.conf|%{ghclibplatform}/.*/libHS.*_p\.a)$

10
macros.ghc
View File

@ -128,10 +128,10 @@ done\
if [ -d %{pkgnamever}.conf ]; then\ if [ -d %{pkgnamever}.conf ]; then\
for i in $(ls "%{pkgnamever}.conf/"); do\ for i in $(ls "%{pkgnamever}.conf/"); do\
sub=$(echo $i | sed -e "s/^[0-9]\\+-//")\ sub=$(echo $i | sed -e "s/^[0-9]\\+-//")\
install -D --mode=0644 %{pkgnamever}.conf/${i} %{buildroot}%{ghclibdir}/package.conf.d/${sub}.conf\ install -D --mode=0644 %{pkgnamever}.conf/${i} %{buildroot}%{ghcliblib}/package.conf.d/${sub}.conf\
done\ done\
else\ else\
install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}.conf\ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}.conf\
fi\ fi\
%{nil} %{nil}
@ -214,11 +214,11 @@ for lib in %*; do\
*$PWD/$lib/dist/build*)\ *$PWD/$lib/dist/build*)\
case %{ghc_version} in\ case %{ghc_version} in\
7.10.*)\ 7.10.*)\
pkgid=$(cd %{buildroot}%{ghclibdir}/package.conf.d; ls ${lib}* | sed -e "s/.conf$//")\ pkgid=$(cd %{buildroot}%{ghcliblib}/package.conf.d; ls ${lib}* | sed -e "s/.conf$//")\
syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} --global --package-db=%{buildroot}%{ghclibdir}/package.conf.d field $pkgid library-dirs) ;;\ syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghcliblib} --global --package-db=%{buildroot}%{ghcliblib}/package.conf.d field $pkgid library-dirs) ;;\
8.0)\ 8.0)\
pkgid=$(cd %{buildroot}%{ghclibdir}; echo ${lib}*)\ pkgid=$(cd %{buildroot}%{ghclibdir}; echo ${lib}*)\
syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} --global --package-db=%{buildroot}%{ghclibdir}/package.conf.d field $lib library-dirs | grep $pkgid) ;;\ syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghcliblib} --global --package-db=%{buildroot}%{ghcliblib}/package.conf.d field $lib library-dirs | grep $pkgid) ;;\
*)\ *)\
syspath="" ;;\ syspath="" ;;\
esac\ esac\