handle HSffi.o for without_shared
This commit is contained in:
parent
e3544f2e61
commit
d5612c1ed5
4
ghc.spec
4
ghc.spec
@ -223,7 +223,7 @@ echo "%doc libraries/LICENSE.%1" >> ghc-%2.files
|
|||||||
ls $RPM_BUILD_ROOT%{ghclibdir}/libHS*.so >> ghc-base.files
|
ls $RPM_BUILD_ROOT%{ghclibdir}/libHS*.so >> ghc-base.files
|
||||||
sed -i -e "s|^$RPM_BUILD_ROOT||g" ghc-base.files
|
sed -i -e "s|^$RPM_BUILD_ROOT||g" ghc-base.files
|
||||||
%endif
|
%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
|
sed -i -e "s|^$RPM_BUILD_ROOT||g" ghc-base-devel.files
|
||||||
|
|
||||||
# these are handled as alternatives
|
# these are handled as alternatives
|
||||||
@ -356,7 +356,7 @@ fi
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Feb 10 2011 Jens Petersen <petersen@redhat.com> - 7.0.1-9
|
* Thu Feb 10 2011 Jens Petersen <petersen@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
|
- disable system libffi for secondary archs
|
||||||
- temporarily disable ghc-*-devel BRs for ppc
|
- temporarily disable ghc-*-devel BRs for ppc
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user