Accepting request 140226 from home:ptrommler:branches:devel:languages:haskell
Removed bootstrap code for Factory submission. OBS-URL: https://build.opensuse.org/request/show/140226 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=118
This commit is contained in:
parent
23f9b62f16
commit
efad0c7324
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:35004c0647f6719650381eea65d3e61c133003f867f04502e035401e40849e1b
|
||||
size 120765176
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e699ec96312c9d231d84842f6a58b120d64da0f41f10dba1cdba6c2d512a77dc
|
||||
size 120012932
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 15 07:51:55 UTC 2012 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
- remove bootstrap code
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 14 07:41:59 UTC 2012 - peter.trommler@ohm-hochschule.de
|
||||
|
||||
|
31
ghc.spec
31
ghc.spec
@ -32,9 +32,6 @@ License: BSD-3-Clause
|
||||
Url: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
|
||||
Summary: The Glorious Glasgow Haskell Compiler
|
||||
|
||||
# Remove after initial bootstrap
|
||||
%if %{defined without_binary_ghc}
|
||||
# end bootstrap
|
||||
%if %{defined ghc_bootstrapping}
|
||||
BuildRequires: ghc-compiler >= 6.12
|
||||
%else
|
||||
@ -54,7 +51,6 @@ BuildRequires: ghc-unix-devel
|
||||
BuildRequires: ghc-array-devel
|
||||
BuildRequires: ghc-old-locale-devel
|
||||
BuildRequires: ghc-old-time-devel
|
||||
BuildRequires: ghc-random-devel
|
||||
BuildRequires: ghc-time-devel
|
||||
BuildRequires: ghc-binary-devel
|
||||
BuildRequires: ghc-deepseq-devel
|
||||
@ -63,7 +59,6 @@ BuildRequires: ghc-containers
|
||||
BuildRequires: ghc-base
|
||||
BuildRequires: ghc-haskell98
|
||||
BuildRequires: ghc-array
|
||||
BuildRequires: ghc-random
|
||||
BuildRequires: ghc-time
|
||||
BuildRequires: ghc-process
|
||||
BuildRequires: ghc-directory
|
||||
@ -74,9 +69,6 @@ BuildRequires: ghc-filepath
|
||||
BuildRequires: ghc-deepseq
|
||||
%endif
|
||||
%endif
|
||||
# Remove after initial bootstrap
|
||||
%endif
|
||||
#end bootstrap
|
||||
BuildRequires: ghc-rpm-macros >= 0.91
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: libffi-devel
|
||||
@ -99,12 +91,6 @@ Requires: ghc-compiler = %{version}-%{release}
|
||||
Requires: ghc-libraries = %{version}-%{release}
|
||||
Requires: ghc-ghc-devel = %{version}-%{release}
|
||||
Source: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
|
||||
# remove after initial bootstrap
|
||||
# Binary distributions for initial bootstrap
|
||||
%global bootstrap_version %{version}
|
||||
Source1: %{name}-%{bootstrap_version}-%{_arch}-unknown-linux.tar.bz2
|
||||
# NoSource: 1
|
||||
# end bootstrap
|
||||
# PATCH-FIX-UPSTREAM ghc-use-system-libffi.patch peter.trommler@ohm-hochschule.de - See Haskell trac #4496 and #5743
|
||||
Patch: ghc-use-system-libffi.patch
|
||||
# PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch peter.trommler@ohm-hochschule.de -- temporary fix for Haskell trac #7062, ghc libraries do not work with as_needed and new-dtags both enabled
|
||||
@ -155,15 +141,9 @@ To install all of GHC install package ghc.
|
||||
%global ghc_version_override %{version}
|
||||
|
||||
|
||||
# Remove after initial bootstrap
|
||||
%if %{defined without_binary_ghc}
|
||||
# end bootstrap
|
||||
%global _use_internal_dependency_generator 0
|
||||
%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}
|
||||
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}
|
||||
# Remove after initial bootstrap
|
||||
%endif
|
||||
# end bootstrap
|
||||
|
||||
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
|
||||
|
||||
@ -212,9 +192,6 @@ This is a meta-package for all the development library packages in GHC
|
||||
except the ghc library, which is installed by the toplevel ghc metapackage.
|
||||
|
||||
%prep
|
||||
# Remove after initial bootstrap
|
||||
%setup -q -T -c -n bootstrap -a 1
|
||||
#end bootstrap
|
||||
%setup -q
|
||||
rm -r ghc-tarballs/{mingw,perl}
|
||||
%patch -p1 -b .libffi
|
||||
@ -229,13 +206,6 @@ ln -s $(pkg-config --variable=includedir libffi)/*.h rts/dist/build
|
||||
%patch6 -p1
|
||||
|
||||
%build
|
||||
# Remove after initial bootstrap
|
||||
pushd ../bootstrap/%{name}-%{bootstrap_version}
|
||||
./configure --prefix %{_builddir}/ghc
|
||||
make install
|
||||
popd
|
||||
# end bootstrap
|
||||
|
||||
# required for patch1
|
||||
autoreconf -fi
|
||||
|
||||
@ -261,7 +231,6 @@ export CFLAGS="${CFLAGS:-%optflags}"
|
||||
--libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
|
||||
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
|
||||
--docdir=%{ghcdocroot} \
|
||||
--with-ghc=%{_builddir}/ghc/bin/ghc\
|
||||
--with-gcc=%{_bindir}/gcc
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
Loading…
x
Reference in New Issue
Block a user