From 8bce457cb2c7af4784cf0f5fbf1cf317e7f1a980 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 31 Jul 2018 01:30:50 +0900 Subject: [PATCH] insert a Setup.hs file if none shipped in package current foundation and rio have no Setup.hs --- Setup.hs | 3 +++ ghc-rpm-macros.spec | 9 ++++++++- macros.ghc | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Setup.hs diff --git a/Setup.hs b/Setup.hs new file mode 100644 index 0000000..e8ef27d --- /dev/null +++ b/Setup.hs @@ -0,0 +1,3 @@ +import Distribution.Simple + +main = defaultMain diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index cde08b4..2fef7f3 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.9.1 +Version: 1.9.2 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -27,6 +27,7 @@ Source6: macros.ghc-extra Source7: ghc.attr Source8: ghc-pkg-wrapper Source9: macros.ghc-os +Source10: Setup.hs Source11: cabal-tweak-drop-dep Requires: redhat-rpm-config # for ghc_version @@ -128,6 +129,8 @@ install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh install -p -D -m 0644 %{SOURCE7} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr %endif +install -p -D -m 0644 %{SOURCE10} %{buildroot}/%{_datadir}/%{name}/Setup.hs + install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag install -p -D -m 0755 %{SOURCE11} %{buildroot}/%{_bindir}/cabal-tweak-drop-dep @@ -154,6 +157,7 @@ EOF %{_bindir}/cabal-tweak-dep-ver %{_bindir}/cabal-tweak-drop-dep %{_bindir}/cabal-tweak-flag +%{_datadir}/%{name}/Setup.hs %files extra @@ -166,6 +170,9 @@ EOF %changelog +* Tue Jul 31 2018 Jens Petersen - 1.9.2-1 +- inject a Setup.hs if none shipped + * Tue Jul 24 2018 Jens Petersen - 1.9.1-1 - remove -Wall and -Werror=format-security separately (on aarch64 and s390x) diff --git a/macros.ghc b/macros.ghc index e0af09b..6313c1f 100644 --- a/macros.ghc +++ b/macros.ghc @@ -24,6 +24,9 @@ export CFLAGS\ %ghc_set_cflags\ %global _hardened_ldflags %{nil}\ LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ +if ! [ -f Setup.hs -o -f Setup.lhs ]; then\ +cp %{_datadir}/ghc-rpm-macros/Setup.hs .\ +fi\ %cabal --version\ %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc %{?_ghcdynlibdir:--dynlibdir=%{_ghcdynlibdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')}" %{?cabal_configure_options} $cabal_configure_extra_options