The package rpms/ghc-rpm-macros.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ghc-rpm-macros.git/commit/?id=0ca...
https://src.fedoraproject.org/cgit/rpms/ghc-rpm-macros.git/commit/?id=af1....
Change:
-%ifarch ppc64le\
+%ifarch ppc64le\
Thanks.
Full change:
============
commit de9f0ee420feeeb8a101cdb3754400bc25e28edd
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Dec 20 14:23:29 2021 +0800
ghc-deps.sh: only exclude unversioned rts.conf
- Hadrian's rts.conf is versioned
- bin-package-db disappeared in ghc7
This change prevents:
nothing provides ghc-9.2.1-devel(ghc-prim-0.8.0-1.0.2) needed by
ghc9.2-base-devel-4.16.0.0-2.fc36.x86_64
diff --git a/ghc-deps.sh b/ghc-deps.sh
index 9a104b0..ffd0d10 100755
--- a/ghc-deps.sh
+++ b/ghc-deps.sh
@@ -36,7 +36,7 @@ for i in $files; do
# exclude rts.conf
$PKGCONFDIR/*-*.conf)
name=$(grep "^name: " $i | sed -e "s/name: //")
- ids=$($GHC_PKG field $name $field | sed -e "s/ rts\b//" -e
"s/bin-package-db-[^ ]\+//")
+ ids=$($GHC_PKG field $name $field | sed -e "s/ rts[^-]//")
for d in $ids; do
case $d in
*-*-internal) ;;
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 04b1109..35205d1 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
%endif
Name: ghc-rpm-macros
-Version: 2.3.8
+Version: 2.3.9
Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC
@@ -184,6 +184,9 @@ EOF
%changelog
+* Mon Dec 20 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.9-1
+- ghc-deps.sh: only exclude unversioned rts.conf
+
* Mon Dec 20 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.8-1
- _arch fits Cabal better for ghclibplatform
commit 8f20a5c4d0255b336e0e106153b4ee9611101125
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Dec 20 13:45:07 2021 +0800
_arch fits Cabal better for ghclibplatform
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 201de12..04b1109 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
%endif
Name: ghc-rpm-macros
-Version: 2.3.7
+Version: 2.3.8
Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC
@@ -184,6 +184,9 @@ EOF
%changelog
+* Mon Dec 20 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.8-1
+- _arch fits Cabal better for ghclibplatform
+
* Mon Dec 20 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.7-1
- ghclibplatform: Cabal uses i386 for i686
diff --git a/macros.ghc b/macros.ghc
index c185808..dc91a70 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -67,7 +67,7 @@ fi\
%ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
# Cabal has specific arch names
-%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/"
-e "s/i686/i386/")-linux-ghc-%{ghc_version}}
+%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(echo %{_arch} | sed -e
"s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}}
# ghc_gen_filelists [name] [version]
%ghc_gen_filelists()\
commit 9683ed7d4a4a86d550a46d81db3fe8888b976db4
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Dec 20 03:05:20 2021 +0800
ghclibplatform: Cabal calls i686 as i386
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 9665280..201de12 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
%endif
Name: ghc-rpm-macros
-Version: 2.3.6
+Version: 2.3.7
Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC
@@ -184,6 +184,9 @@ EOF
%changelog
+* Mon Dec 20 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.7-1
+- ghclibplatform: Cabal uses i386 for i686
+
* Mon Dec 20 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.6-1
- fix missing Hadrian ghc dependency generation
diff --git a/macros.ghc b/macros.ghc
index 84ff039..c185808 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -66,7 +66,8 @@ fi\
%ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
-%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e
"s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}}
+# Cabal has specific arch names
+%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/"
-e "s/i686/i386/")-linux-ghc-%{ghc_version}}
# ghc_gen_filelists [name] [version]
%ghc_gen_filelists()\
commit 810a659ee871e5d50744dae72e5c83e12f313bee
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Dec 20 01:21:45 2021 +0800
fix Hadrian ghc dependency generation
diff --git a/ghc-deps.sh b/ghc-deps.sh
index 6441103..9a104b0 100755
--- a/ghc-deps.sh
+++ b/ghc-deps.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# find rpm provides and requires for Haskell GHC libraries
-[ $# -lt 2 ] && echo "Usage: $(basename $0) [--provides|--requires]
%{buildroot}%{ghcliblib} [%{?ghc_name}]" && exit 1
+[ $# -lt 2 ] && echo "Usage: $(basename $0) [--provides|--requires]
%{buildroot}%{ghclibdir} [%{?ghc_name}]" && exit 1
set +x
@@ -11,7 +11,12 @@ if [ -z "$3" ];
then GHCPREFIX=ghc
else GHCPREFIX=$3
fi
-PKGCONFDIR=$PKGBASEDIR/package.conf.d
+if [ -d $PKGBASEDIR/lib ];
+then PKGBASELIB=$PKGBASEDIR/lib
+ LIB=lib/
+else PKGBASELIB=$PKGBASEDIR
+fi
+PKGCONFDIR=$PKGBASELIB/package.conf.d
GHC_PKG="/usr/lib/rpm/ghc-pkg-wrapper $PKGBASEDIR"
@@ -52,7 +57,7 @@ for i in $files; do
echo "$GHCPREFIX-prof($d)"
;;
*)
- if [ -f /usr/lib*/ghc-*/*/libHS${d}_p.a -o -f
$PKGBASEDIR/*/libHS${d}_p.a ]; then
+ if [ -f /usr/lib*/ghc-*/$LIB*/libHS${d}_p.a -o -f
$PKGBASELIB/*/libHS${d}_p.a ]; then
echo "$GHCPREFIX-prof($d)"
fi
;;
diff --git a/ghc-pkg-wrapper b/ghc-pkg-wrapper
index df48093..98566a8 100755
--- a/ghc-pkg-wrapper
+++ b/ghc-pkg-wrapper
@@ -1,34 +1,21 @@
#!/bin/sh
-[ $# -lt 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghcliblib}
..." && exit 1
+[ $# -lt 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghclibdir}
..." && exit 1
set +x
PKGBASEDIR=$1
shift
-PKGCONFDIR=$PKGBASEDIR/package.conf.d
-case $(basename "$PKGBASEDIR") in
- lib) GHC_VER=$(basename $(dirname $PKGBASEDIR) | sed -e s/ghc-//) ;;
- *) GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//) ;;
-esac
+if [ -d $PKGBASEDIR/lib ];
+then PKGCONFDIR=$PKGBASEDIR/lib/package.conf.d
+else PKGCONFDIR=$PKGBASEDIR/package.conf.d
+fi
# for a ghc build use the new ghc-pkg
-INPLACE_GHCPKG=$PKGBASEDIR/../../bin/ghc-pkg-$GHC_VER
-
-if [ -x "$INPLACE_GHCPKG" ]; then
- case $GHC_VER in
- 7.4.*)
- GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR"
- ;;
- 7.6.*)
- GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR"
- ;;
- # 7.8 and 7.10
- *)
- GHC_PKG="env LD_LIBRARY_PATH=$(dirname $PKGBASEDIR)
$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
- ;;
- esac
+if [ -x "$PKGBASEDIR/bin/ghc-pkg" ]; then
+ GHC_PKG="env LD_LIBRARY_PATH=$(dirname $PKGBASEDIR) $PKGBASEDIR/bin/ghc-pkg
--global-package-db=$PKGCONFDIR"
else
+ GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
GHC_PKG="/usr/bin/ghc-pkg-${GHC_VER} -f $PKGCONFDIR"
fi
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 99115e9..9665280 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
%endif
Name: ghc-rpm-macros
-Version: 2.3.5
+Version: 2.3.6
Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC
@@ -184,6 +184,9 @@ EOF
%changelog
+* Mon Dec 20 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.6-1
+- fix missing Hadrian ghc dependency generation
+
* Sun Dec 19 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.5-1
- Hadrian haddock dirs are not versioned
diff --git a/ghc.attr b/ghc.attr
index b5f080f..8e62be6 100644
--- a/ghc.attr
+++ b/ghc.attr
@@ -1,3 +1,3 @@
-%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghcliblib}
%{?ghc_name:ghc-%{ghc_version}}
-%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghcliblib}
%{?ghc_name:ghc-%{ghc_version}}
+%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}
%{?ghc_name:ghc-%{ghc_version}}
+%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}
%{?ghc_name:ghc-%{ghc_version}}
%__ghc_path ^(%{ghcliblib}/package.conf.d/.*\.conf|%{ghclibplatform}/.*/libHS.*_p\.a)$
commit 2e3e8928be53704dd32269ffa036d2338f2ddfd8
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Dec 20 00:56:20 2021 +0800
%ghc_pkg_recache is not deprecated
diff --git a/macros.ghc b/macros.ghc
index 982c208..84ff039 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -236,7 +236,6 @@ done\
done\
%endif
-# deprecated for f31
%ghc_pkg_recache %{_bindir}/ghc-pkg-%{ghc_version} recache --no-user-package-db || :
# skip prof libs and documentation
commit 6d65c1ff51788e4b557b8ecce67d72379c80fbf5
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sun Dec 19 15:01:25 2021 +0800
Hadrian haddock dirs are not versioned
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index b94d01d..99115e9 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
%endif
Name: ghc-rpm-macros
-Version: 2.3.4
+Version: 2.3.5
Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC
@@ -184,6 +184,9 @@ EOF
%changelog
+* Sun Dec 19 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.5-1
+- Hadrian haddock dirs are not versioned
+
* Sun Dec 19 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.4-1
- move Cabal_arch into ghclibplatform macro
diff --git a/macros.ghc b/macros.ghc
index 03ab170..982c208 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -101,8 +101,9 @@ touch %{basepkg}-devel.files %{basepkg}-prof.files\
fi\
ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf >>
%{basepkg}-devel.files\
%if %{with haddock}\
-if [ -d %{buildroot}%{ghc_html_libraries_dir}/%{pkgnamever} ]; then\
-echo %{ghc_html_libraries_dir}/%{pkgnamever} >> %{basepkg}-doc.files\
+haddock_dir=%{ghc_html_libraries_dir}/%{?with_hadrian:%pkgname}%{!?with_hadrian:%pkgnamever}\
+if [ -d %{buildroot}$haddock_dir ]; then\
+echo $haddock_dir >> %{basepkg}-doc.files\
fi\
%endif\
for i in %{basepkg}.files %{basepkg}-devel.files %{basepkg}-doc.files
%{basepkg}-prof.files; do\
commit 2e341505b28d7ee1c00e048285d3a34db1d4a510
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sun Dec 19 10:47:11 2021 +0800
move Cabal_arch into ghclibplatform macro
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index f1adbaf..b94d01d 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
%endif
Name: ghc-rpm-macros
-Version: 2.3.3
+Version: 2.3.4
Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC
@@ -184,6 +184,9 @@ EOF
%changelog
+* Sun Dec 19 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.4-1
+- move Cabal_arch into ghclibplatform macro
+
* Sun Dec 19 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.3-1
- fixup ghc_arch renaming it to Cabal_arch
diff --git a/macros.ghc b/macros.ghc
index 9e13dfb..03ab170 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -64,12 +64,9 @@ fi\
%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
-# needed for Cabal ppc64le
-%Cabal_arch %(arch | sed -e "s/ppc64le/ppc64/")
-
%ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
-%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{Cabal_arch}-linux-ghc-%{ghc_version}}
+%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e
"s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}}
# ghc_gen_filelists [name] [version]
%ghc_gen_filelists()\
commit 0ca6183a44c91ab52ecf4635a3fc3c5381fc4036
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sun Dec 19 10:05:10 2021 +0800
fixup ghc_arch renaming it to Cabal_arch
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index a8cb807..f1adbaf 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
%endif
Name: ghc-rpm-macros
-Version: 2.3.2
+Version: 2.3.3
Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC
@@ -184,6 +184,9 @@ EOF
%changelog
+* Sun Dec 19 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.3-1
+- fixup ghc_arch renaming it to Cabal_arch
+
* Sat Dec 18 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.2-1
- define ghcliblib and ghclibplatform globally
- fix ghc-deps.sh dependency generation for Hadrian
diff --git a/macros.ghc b/macros.ghc
index a88cbbb..9e13dfb 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -65,16 +65,11 @@ fi\
%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
# needed for Cabal ppc64le
-%ghc_arch\
-%ifarch ppc64le\
-ppc64\
-%else\
-%{_arch}\
-%endif
+%Cabal_arch %(arch | sed -e "s/ppc64le/ppc64/")
%ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
-%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{ghc_arch}-linux-ghc-%{ghc_version}}
+%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{Cabal_arch}-linux-ghc-%{ghc_version}}
# ghc_gen_filelists [name] [version]
%ghc_gen_filelists()\
commit f0b8f23055e8198b494cc79777e8853aa3b51f1c
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sun Dec 19 01:28:18 2021 +0800
define %ghcliblib and %ghclibplatform globally
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index d220153..a8cb807 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -185,8 +185,9 @@ EOF
%changelog
* Sat Dec 18 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.2-1
-- Cabal uses ppc64 in paths for ppc64le
+- define ghcliblib and ghclibplatform globally
- fix ghc-deps.sh dependency generation for Hadrian
+- Cabal uses ppc64 in paths for ppc64le
* Fri Dec 17 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.1-1
- ghc_gen_filelists: support ghc Hadrian install
diff --git a/macros.ghc b/macros.ghc
index 21832d8..a88cbbb 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -72,14 +72,16 @@ ppc64\
%{_arch}\
%endif
+%ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
+
+%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{ghc_arch}-linux-ghc-%{ghc_version}}
+
# ghc_gen_filelists [name] [version]
%ghc_gen_filelists()\
%define pkgname %{?1}%{!?1:%{pkg_name}}\
%define pkgver %{?2}%{!?2:%{version}}\
%define pkgnamever %{pkgname}-%{pkgver}\
%define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\
-%define ghcliblib %{ghclibdir}%{?with_hadrian:/lib}\
-%define ghclibplatform
%{ghcliblib}%{?with_hadrian:/%{ghc_arch}-linux-ghc-%{ghc_version}}\
if [ -z "$(ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf)" ];
then\
echo '%{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf not found'\
exit 1\
commit 6257a036c5fd32ad31bdbf4f70fbafd1a02e2989
Author: Jens Petersen <petersen(a)redhat.com>
Date: Wed Dec 22 13:15:06 2021 +0800
use ghcliblib/ghclibplatform paths for Hadrian dependency generation
diff --git a/ghc-deps.sh b/ghc-deps.sh
index 72372ba..6441103 100755
--- a/ghc-deps.sh
+++ b/ghc-deps.sh
@@ -1,15 +1,15 @@
#!/bin/sh
# 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
MODE=$1
PKGBASEDIR=$2
-if [ -z "$3" -o "$3" = "ghc" ];
+if [ -z "$3" ];
then GHCPREFIX=ghc
-else GHCPREFIX=$(basename $PKGBASEDIR)
+else GHCPREFIX=$3
fi
PKGCONFDIR=$PKGBASEDIR/package.conf.d
diff --git a/ghc-pkg-wrapper b/ghc-pkg-wrapper
index ca6a32d..df48093 100755
--- a/ghc-pkg-wrapper
+++ b/ghc-pkg-wrapper
@@ -1,13 +1,16 @@
#!/bin/sh
-[ $# -lt 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghclibdir}
..." && exit 1
+[ $# -lt 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghcliblib}
..." && exit 1
set +x
PKGBASEDIR=$1
shift
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
INPLACE_GHCPKG=$PKGBASEDIR/../../bin/ghc-pkg-$GHC_VER
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index e1c7a34..d220153 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -186,6 +186,7 @@ EOF
%changelog
* Sat Dec 18 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.2-1
- Cabal uses ppc64 in paths for ppc64le
+- fix ghc-deps.sh dependency generation for Hadrian
* Fri Dec 17 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.1-1
- ghc_gen_filelists: support ghc Hadrian install
diff --git a/ghc.attr b/ghc.attr
index 59194f6..b5f080f 100644
--- a/ghc.attr
+++ b/ghc.attr
@@ -1,3 +1,3 @@
-%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibplatform}
%{?ghc_name:ghc-%{ghc_version}}
-%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibplatform}
%{?ghc_name:ghc-%{ghc_version}}
-%__ghc_path ^%{ghclibplatform}/(.*/libHS.*_p\.a|package.conf.d/.*\.conf)$
+%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghcliblib}
%{?ghc_name:ghc-%{ghc_version}}
+%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghcliblib}
%{?ghc_name:ghc-%{ghc_version}}
+%__ghc_path ^(%{ghcliblib}/package.conf.d/.*\.conf|%{ghclibplatform}/.*/libHS.*_p\.a)$
diff --git a/macros.ghc b/macros.ghc
index 7c94045..21832d8 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -128,10 +128,10 @@ done\
if [ -d %{pkgnamever}.conf ]; then\
for i in $(ls "%{pkgnamever}.conf/"); do\
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\
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\
%{nil}
@@ -214,11 +214,11 @@ for lib in %*; do\
*$PWD/$lib/dist/build*)\
case %{ghc_version} in\
7.10.*)\
- pkgid=$(cd %{buildroot}%{ghclibdir}/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)
;;\
+ pkgid=$(cd %{buildroot}%{ghcliblib}/package.conf.d; ls ${lib}* | sed -e
"s/.conf$//")\
+ syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghcliblib}
--global --package-db=%{buildroot}%{ghcliblib}/package.conf.d field $pkgid library-dirs)
;;\
8.0)\
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="" ;;\
esac\
commit af1552c247a5bca4476c4907baecca777100ae3c
Author: Jens Petersen <petersen(a)redhat.com>
Date: Wed Dec 22 13:13:50 2021 +0800
Cabal uses ppc64 in paths instead of ppc64le
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index d220153..e1c7a34 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -186,7 +186,6 @@ EOF
%changelog
* Sat Dec 18 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.2-1
- Cabal uses ppc64 in paths for ppc64le
-- fix ghc-deps.sh dependency generation for Hadrian
* Fri Dec 17 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.1-1
- ghc_gen_filelists: support ghc Hadrian install
diff --git a/macros.ghc b/macros.ghc
index 0a1d1ac..7c94045 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -65,10 +65,11 @@ fi\
%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
# needed for Cabal ppc64le
-%ifarch ppc64le
-%ghc_arch ppc64
-%else
-%ghc_arch %{_arch}
+%ghc_arch\
+%ifarch ppc64le\
+ppc64\
+%else\
+%{_arch}\
%endif
# ghc_gen_filelists [name] [version]