[ghc] handle HSffi.o for without_shared
Jens Petersen
petersen at fedoraproject.org
Thu Feb 10 06:15:20 UTC 2011
commit d5612c1ed5fe459de085b5cae8dc985786bf3592
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Feb 10 16:15:17 2011 +1000
handle HSffi.o for without_shared
ghc.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index 00787a4..d4d6b48 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -223,7 +223,7 @@ echo "%doc libraries/LICENSE.%1" >> ghc-%2.files
ls $RPM_BUILD_ROOT%{ghclibdir}/libHS*.so >> ghc-base.files
sed -i -e "s|^$RPM_BUILD_ROOT||g" ghc-base.files
%endif
-ls -d $RPM_BUILD_ROOT%{ghclibdir}/libHS*.a $RPM_BUILD_ROOT%{ghclibdir}/package.conf.d/builtin_*.conf $RPM_BUILD_ROOT%{ghclibdir}/include >> ghc-base-devel.files
+ls -d $RPM_BUILD_ROOT%{ghclibdir}/libHS*.a %{!?with_libffi:$RPM_BUILD_ROOT%{ghclibdir}/HSffi.o} $RPM_BUILD_ROOT%{ghclibdir}/package.conf.d/builtin_*.conf $RPM_BUILD_ROOT%{ghclibdir}/include >> ghc-base-devel.files
sed -i -e "s|^$RPM_BUILD_ROOT||g" ghc-base-devel.files
# these are handled as alternatives
@@ -356,7 +356,7 @@ fi
%changelog
* Thu Feb 10 2011 Jens Petersen <petersen at redhat.com> - 7.0.1-9
-- fix non shared build for ppc, etc
+- fix without_shared build (thanks Adrian Reber)
- disable system libffi for secondary archs
- temporarily disable ghc-*-devel BRs for ppc
More information about the scm-commits
mailing list