diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index ad52e8e2034c41f408ee022bafea91315c064e24..c05088ca7f3dc322ea058cd0568412bc9f47f101 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,14 +1,15 @@ Name: ghc-rpm-macros Version: 2.5.2 -Release: 3 +Release: 4 Summary: RPM Macros for building packages for GHC License: GPL-3.0-or-later URL: https://src.fedoraproject.org/rpms/ghc-rpm-macros Source0: %{name}-%{version}.tar.xz # In openEuler, we use help as documents package's suffix instead of doc. Patch1: using-help-as-doc-packages-suffix.patch +Patch2: remove-leading-and-trailing-space.patch # Use debug_package instead of _enable_debug_packages to disable debuginfo. -Patch2: disable-debuginfo.patch +Patch3: disable-debuginfo.patch BuildRequires: xz Requires: rpm Requires: chrpath @@ -63,6 +64,9 @@ install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs %{_rpmmacrodir}/macros.ghc-extra %changelog +* Fri Feb 28 2025 Lin Runze 2.5.2-4 +- Remove leading and trailing spaces in CFLAGS and LDFLAGS to avoid linking failure. + * Mon Nov 25 2024 Lin Runze 2.5.2-3 - Use debug_package instead of _enable_debug_packages to disable debuginfo diff --git a/remove-leading-and-trailing-space.patch b/remove-leading-and-trailing-space.patch new file mode 100644 index 0000000000000000000000000000000000000000..050631e5483200a8882dcbd009119e50a9244435 --- /dev/null +++ b/remove-leading-and-trailing-space.patch @@ -0,0 +1,12 @@ +diff --color -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.ghc +--- origin/ghc-rpm-macros-2.5.2/macros.ghc 2025-02-28 18:55:10.289782645 +0800 ++++ ghc-rpm-macros-2.5.2/macros.ghc 2025-02-28 18:55:58.619767541 +0800 +@@ -98,7 +98,7 @@ + subsubdir=/lib\ + fi\ + %cabal --version\ +-%cabal configure %{!-W:%{?ghc_name:--with-compiler=%{_bindir}/ghc-%{ghc_version}}} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler'${subsubdir}/'$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc --dynlibdir=%{?_ghcdynlibdir}%{?!_ghcdynlibdir:%{_libdir}/ghc-%{ghc_version}${subsubdir}} %{!?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')} -fhide-source-paths" %{?cabal_configure_options} $cabal_configure_extra_options ++%cabal configure %{!-W:%{?ghc_name:--with-compiler=%{_bindir}/ghc-%{ghc_version}}} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler'${subsubdir}/'$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc --dynlibdir=%{?_ghcdynlibdir}%{?!_ghcdynlibdir:%{_libdir}/ghc-%{ghc_version}${subsubdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$(echo $CFLAGS | awk '{$1=$1};1') | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$(echo $LDFLAGS | awk '{$1=$1};1') | sed -e 's/ / -optl/g')} -fhide-source-paths" %{?cabal_configure_options} $cabal_configure_extra_options + + # install + %cabal_install %cabal copy --destdir=%{buildroot} %{?cabal_install_options}