try temporarily disabling all the ppc64 "hacks" to see if really all needed
This commit is contained in:
parent
d2fbf7eeec
commit
d6e745ac28
19
ghc.spec
19
ghc.spec
@ -73,9 +73,6 @@ BuildRequires: hscolour
|
|||||||
%if %{undefined without_testsuite}
|
%if %{undefined without_testsuite}
|
||||||
BuildRequires: python
|
BuildRequires: python
|
||||||
%endif
|
%endif
|
||||||
%ifarch ppc64
|
|
||||||
BuildRequires: autoconf
|
|
||||||
%endif
|
|
||||||
%ifarch armv7hl armv5tel
|
%ifarch armv7hl armv5tel
|
||||||
BuildRequires: llvm >= 3.0
|
BuildRequires: llvm >= 3.0
|
||||||
%endif
|
%endif
|
||||||
@ -206,14 +203,6 @@ rm -r ghc-tarballs/libffi
|
|||||||
mkdir -p rts/dist/build
|
mkdir -p rts/dist/build
|
||||||
ln -s $(pkg-config --variable=includedir libffi)/*.h rts/dist/build
|
ln -s $(pkg-config --variable=includedir libffi)/*.h rts/dist/build
|
||||||
|
|
||||||
%ifarch ppc64
|
|
||||||
%patch7 -p1 -b .pthread
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%ifarch ppc ppc64
|
|
||||||
%patch8 -p1 -b .mmap
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%patch9 -p1 -b .orig
|
%patch9 -p1 -b .orig
|
||||||
|
|
||||||
|
|
||||||
@ -234,16 +223,8 @@ HSCOLOUR_SRCS = NO
|
|||||||
%ifarch %{unregisterised_archs}
|
%ifarch %{unregisterised_archs}
|
||||||
GhcUnregisterised=YES
|
GhcUnregisterised=YES
|
||||||
%endif
|
%endif
|
||||||
%ifarch ppc64
|
|
||||||
GhcNotThreaded=YES
|
|
||||||
SRC_HC_OPTS+=-optc-mminimal-toc -optl-pthread
|
|
||||||
SRC_CC_OPTS+=-mminimal-toc -pthread -Wa,--noexecstack
|
|
||||||
%endif
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
%ifarch ppc64
|
|
||||||
autoreconf
|
|
||||||
%endif
|
|
||||||
export CFLAGS="${CFLAGS:-%optflags}"
|
export CFLAGS="${CFLAGS:-%optflags}"
|
||||||
# specify gcc to avoid problems when bootstrapping with ccache
|
# specify gcc to avoid problems when bootstrapping with ccache
|
||||||
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
|
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
|
||||||
|
Loading…
Reference in New Issue
Block a user