rpms/ghc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

add bcond for system libffi and fix system libffi build

Browse Source 
- rename ghc-use-system-libffi-debian.patch to ghc-use-system-libffi.patch.
- add ffi to SRC_HC_OPTS
- use pkgconfig-depends in compiler/ghc.cabal for libffi
This commit is contained in:
Jens Petersen 2010-11-05 18:28:54 +10:00
parent 5311ca59f4
commit 8b84ee0dba
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghc-use-system-libffi-debian.patch → ghc-use-system-libffi.patch
View File

@ -108,3 +108,15 @@ Index: ghc6-6.12.3/rts/package.conf.in
hugs-options: hugs-options:
cc-options: cc-options:
diff -u ghc-6.12.3/compiler/ghc.cabal.in\~ ghc-6.12.3/compiler/ghc.cabal.in
--- ghc-6.12.3/compiler/ghc.cabal.in~ 2010-06-10 04:10:09.000000000 +1000
+++ ghc-6.12.3/compiler/ghc.cabal.in 2010-11-05 18:08:11.000000000 +1000
@@ -83,7 +83,7 @@
if flag(ghci)
Build-Depends: template-haskell
CPP-Options: -DGHCI
- Include-Dirs: ../libffi/build/include
+ pkgconfig-depends: libffi
if !flag(ncg)
CPP-Options: -DOMIT_NATIVE_CODEGEN

16
ghc.spec
View File

@ -13,6 +13,8 @@
%bcond_without testsuite %bcond_without testsuite
# include colored html src # include colored html src
%bcond_without hscolour %bcond_without hscolour
# use system libffi
%bcond_without libffi
## default disabled options ## ## default disabled options ##
# include extralibs # include extralibs
@ -53,7 +55,9 @@ Obsoletes: ghc-time-devel < 1.1.2.4-5
Obsoletes: ghc-time-doc < 1.1.2.4-5 Obsoletes: ghc-time-doc < 1.1.2.4-5
BuildRequires: ghc, ghc-rpm-macros >= 0.8.2 BuildRequires: ghc, ghc-rpm-macros >= 0.8.2
BuildRequires: gmp-devel, ncurses-devel BuildRequires: gmp-devel, ncurses-devel
%if %{with libffi}
BuildRequires: libffi-devel BuildRequires: libffi-devel
%endif
Requires: gcc, gmp-devel Requires: gcc, gmp-devel
%if %{with shared} %if %{with shared}
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
@ -70,7 +74,7 @@ BuildRequires: python
Patch1: ghc-6.12.1-gen_contents_index-haddock-path.patch Patch1: ghc-6.12.1-gen_contents_index-haddock-path.patch
Patch2: ghc-gen_contents_index-type-level.patch Patch2: ghc-gen_contents_index-type-level.patch
Patch3: ghc-gen_contents_index-cron-batch.patch Patch3: ghc-gen_contents_index-cron-batch.patch
Patch4: ghc-use-system-libffi-debian.patch Patch4: ghc-use-system-libffi.patch
%description %description
GHC is a state-of-the-art programming suite for Haskell, a purely GHC is a state-of-the-art programming suite for Haskell, a purely
@ -118,9 +122,11 @@ They should be installed when GHC's profiling subsystem is needed.
# disable gen_contents_index when not --batch for cron # disable gen_contents_index when not --batch for cron
%patch3 -p1 %patch3 -p1
# use system libffi # use system libffi
%if %{with libffi}
%patch4 -p1 -b .libffi %patch4 -p1 -b .libffi
%endif
# prefer system libraries # use system libraries
rm -r ghc-tarballs rm -r ghc-tarballs
%build %build
@ -142,6 +148,9 @@ SplitObjs = NO
%if %{without hscolour} %if %{without hscolour}
HSCOLOUR_SRCS = NO HSCOLOUR_SRCS = NO
%endif %endif
%if %{with libffi}
SRC_HC_OPTS += -lffi
%endif
EOF EOF
export CFLAGS="${CFLAGS:-%optflags}" export CFLAGS="${CFLAGS:-%optflags}"
@ -296,7 +305,8 @@ fi
* Thu Nov 4 2010 Jens Petersen <petersen@redhat.com> - 6.12.3-8 * Thu Nov 4 2010 Jens Petersen <petersen@redhat.com> - 6.12.3-8
- add a cronjob for doc indexing - add a cronjob for doc indexing
- disable gen_contents_index when not run with --batch for cron - disable gen_contents_index when not run with --batch for cron
- use system libffi with ghc-use-system-libffi-debian.patch - use system libffi with ghc-use-system-libffi.patch from debian
- add bcond for system libffi
* Thu Nov 4 2010 Jens Petersen <petersen@redhat.com> - 6.12.3-7 * Thu Nov 4 2010 Jens Petersen <petersen@redhat.com> - 6.12.3-7
- skip huge type-level docs from haddock re-indexing (#649228) - skip huge type-level docs from haddock re-indexing (#649228)