Commit Graph

54 Commits

Author SHA1 Message Date
Jens Petersen
15b76d9f76 improve the bootstrap abort error text 2011-05-08 23:23:11 +09:00
Jens Petersen
8af86b797a drop ghc_pkg_deps from ghc_package_devel and ghc_package_prof 2011-05-08 23:09:07 +09:00
Jens Petersen
cbf3d70e56 provides ghc-*-doc still needed for current lib templates 2011-04-01 16:54:19 +09:00
Jens Petersen
78a6eab552 fix self-bootstrap check 2011-03-28 16:45:18 +09:00
Jens Petersen
cd30bb3547 check PKGBASEDIR, ghc bootstrapping, ghc_reindex_haddock nop, drop ghc-*-doc provides
- ghc-deps.sh: check PKGBASEDIR exists to avoid warning for bin package
- abort cabal_configure if ghc is not self-bootstrapped
- make ghc_reindex_haddock a safe no-op
- no longer provide ghc-*-doc
- no longer run ghc_reindex_haddock in ghc-*-devel scripts
2011-03-28 15:57:59 +09:00
Jens Petersen
82b34c5629 add ghc_pkg_obsoletes to shared lib package too 2011-03-10 15:02:39 +09:00
Jens Petersen
30ceea2628 add docdir when subpackaging packages too 2011-03-09 15:12:41 +09:00
Jens Petersen
2c0b10d5d5 disable shared and dynamic on secondary archs
- this package is now arch-dependent
- rename without_shared to ghc_without_shared and without_dynamic
  to ghc_without_dynamic so that they can be globally defined for
  secondary archs without shared libs
- use %%undefined macro
- disable debug_package in ghc_bin_build and ghc_lib_build
- set ghc_without_shared and ghc_without_dynamic on secondary
  (ie non main intel archs)
- disable debuginfo for self
2011-02-13 01:07:05 +10:00
Jens Petersen
26005406d3 revert setting without_shared and without_dynamic on secondary archs 2011-02-11 01:50:04 +10:00
Jens Petersen
30f51fc80d more non-shared fixes to avoid dynamic and shared on secondary archs
- only link Setup dynamically if without_shared and without_dynamic not set
- set without_shared and without_dynamic by default on secondary archs
  in cabal_bin_build and cabal_lib_build
- add cabal_configure_options to pass extra options to cabal_configure
2011-02-11 00:33:37 +10:00
Jens Petersen
1f4312aeaa fix ghc-deps.sh for without_shared libraries 2011-02-10 22:11:02 +10:00
Jens Petersen
876ea626db simplify adding shared subpackage license file; own ghc-deps.sh not /usr/lib/rpm 2011-01-29 22:34:52 +10:00
Jens Petersen
a1abcaaa78 add rpm hash requires for dynamic executables in ghc-deps.sh
- compile Setup in cabal macro
- use _rpmconfigdir
2011-01-23 15:05:38 +10:00
Jens Petersen
ed934fb2e1 fix the filelist docdir for-loop 2011-01-22 23:38:19 +10:00
Jens Petersen
85779fa14f fix Requires misindent in ghc_devel_requires 2011-01-22 23:02:28 +10:00
Jens Petersen
b13abaef50 bunch of tweaks, cleanup, and improvements
- drop deprecated ghcdocdir and ghcpkgdir
- new ghclibdocdir
- replace some missed RPM_BUILD_ROOT's
- bring back ghc requires in ghc_devel_requires
- improve prof summary and description
- add without_prof and without_haddock option macros
2011-01-22 22:48:18 +10:00
Jens Petersen
0f8bb5330b compile Setup to help speed up builds 2011-01-21 10:48:06 +10:00
Jens Petersen
4d6720d40f make sure license is in binlib shared subpackage and add option to exclude package from ghc_packages_list
- put docdir (license) also into shared lib subpackage
- add ghc_binlib_package option to exclude package from ghc_packages_list
- condition lib base package additional description for srpm
2011-01-20 18:25:37 +10:00
Jens Petersen
086f1bc5e0 more ghc libraries subpackaging fixes and other cleanup
- use buildroot instead of RPM_BUILD_ROOT
- rename ghcpkgbasedir to ghclibdir
- split "[name-version]" args into "[name] [version]" args
- move remaining name and version macro options (-n and -v) to args
- drop deprecated -o options
2011-01-03 20:37:32 +09:00
Jens Petersen
c6c20a5951 add support for subpackaging multiple libraries for ghc 2010-12-30 21:19:29 +09:00
Jens Petersen
7d50a02159 revert disabling debug_package since it behaves inconsistently with redhat-rpm-config 2010-12-20 19:05:33 +10:00
Jens Petersen
21e17e3468 drop with_devhelp since html-help option gone from haddock-2.8.0 2010-11-26 12:29:14 +10:00
Jens Petersen
3ca7af736f bring back the explicit n-v-r internal package requires for devel and prof packages 2010-11-23 17:08:28 +10:00
Jens Petersen
7232a81da9 implement rpm ghc-pkg hash metadata for precise automatic library dependency tracking
- add buildroot/ghcpkgbasedir to ghc-deps.sh args
- calculate package and metadata by checking all library files in stdin
- prof depends on devel, devel on base
- update macros.ghc:
  -  rename ghc_requires to ghc_devel_requires
  - drop ghc_doc_requires
  - ghc_reindex_haddock is deprecated and now a no-op
2010-11-23 15:01:27 +10:00
Jens Petersen
02c69a3bd2 fix without_shared build so it actually works 2010-09-30 13:12:47 +10:00
Jens Petersen
742ca58b86 add ghc-deps.sh for hash rpm metadata and add ghc_pkg_obsoletes
- add ghc-deps.sh for ghc package hash rpm metadata provides and requires
- turn on hash provides and disable debuginfo by default
- make shared and hscolour default
- use without_shared and without_hscolour to disble them
- add ghc_pkg_obsoletes for obsoleting old packages
- use ghcpkgbasedir
- always obsolete -doc packages, but keep -o for now for backward compatibility
2010-09-30 12:21:16 +10:00
Jens Petersen
601aa5ffc1 - fix ghc_strip_dynlinked when no dynlinked files
- devel should provide doc also when not obsoleting
2010-07-17 08:08:37 +00:00
Jens Petersen
4e21230c7d merge -doc into -devel and provide -o obsoletes doc subpackage option 2010-07-15 14:43:34 +00:00
Jens Petersen
428e0de417 - support hscolour'ing of src via haddock
- really remove redundant summary and description option flags
2010-06-28 07:33:22 +00:00
Jens Petersen
28ead10bfc new ghc_bin_build, ghc_bin_install, ghc_lib_build, ghc_lib_install 2010-06-26 08:53:39 +00:00
Jens Petersen
85dddb6d0b couple more fallback summary tweaks 2010-06-24 06:05:43 +00:00
Jens Petersen
f7eafbf000 - drop the summary -s and description -d package options since rpm does not
seem to allow white\ space in macro option args anyway
2010-06-24 02:13:22 +00:00
Jens Petersen
4e07127a2c make ghc_strip_dynlinked conditional on no debug_package 2010-06-23 10:24:53 +00:00
Jens Petersen
07f858eab5 replace ghc_strip_shared with ghc_strip_dynlinked 2010-06-23 10:05:24 +00:00
Jens Petersen
eaf24211e8 add ghc_strip_shared to strip shared libraries 2010-06-20 12:44:49 +00:00
Jens Petersen
a0e7adadfe - add comments over macros
- drop unused cabal_makefile
2010-06-20 12:10:25 +00:00
Jens Petersen
d9a9b5f4af - drop unused ghc_pkg_ver macro
- add ghc_pkg_recache macro
2010-04-12 14:52:34 +00:00
Jens Petersen
4393386478 - drop optional 2nd version arg from ghcdocdir, ghcpkgdir, and
ghc_gen_filelists: multiversion subpackages are not supported
- add ghcpkgbasedir
- bring back some shared conditions which were dropped temporarily
- test for ghcpkgdir and ghcdocdir in ghc_gen_filelists
- allow optional pkgname arg for cabal_pkg_conf
- can now package gtk2hs
2010-01-14 14:32:25 +00:00
Jens Petersen
a0bbde907a use -v in ghc_requires and ghc_prof_requires for version 2010-01-11 06:51:22 +00:00
Jens Petersen
9d7c9aecc0 drop "Library for" from base lib summary 2010-01-11 05:13:02 +00:00
Jens Petersen
5f3759a686 use -n in ghc_requires and ghc_prof_requires for when no pkg_name 2010-01-11 03:13:01 +00:00
Jens Petersen
c97ee70960 - add ghcdocbasedir
- revert ghcdocdir to match upstream ghc
- ghcdocdir and ghcpkgdir now take optional name version args
- update ghc_gen_filelists to new optional name version args
- handle docdir in ghc_gen_filelists
- ghc_reindex_haddock uses ghcdocbasedir
- summary and description options added to ghc_binlib_package,
    ghc_package_devel, ghc_package_doc, and ghc_package_prof
2010-01-10 14:59:10 +00:00
Jens Petersen
23340a3f97 - pkg_name must be set now for binlib packages too
- new ghc_lib_package and ghc_binlib_package macros make packaging too easy
- ghc_package_devel, ghc_package_doc, and ghc_package_prof helper macros
- ghc_gen_filelists now defaults to ghc-%%{pkg_name}
- add dynamic bcond to cabal_configure instead of cabal_configure_dynamic
2010-01-09 15:58:27 +00:00
Jens Petersen
dffc2c5084 - add cabal_configure_dynamic
- add ghc_requires, ghc_doc_requires, ghc_prof_requires
2009-12-23 14:42:16 +00:00
Jens Petersen
8b0ec9d34e - use ghc_version_override to override ghc_version
- fix pkg .conf filelist match
2009-12-15 21:50:31 +00:00
Jens Petersen
b22ec8887d major updates for ghc-6.12, package.conf.d, and shared libraries
- add shared support to cabal_configure, ghc_gen_filelists
- version ghcdocdir
- replace ghc_gen_scripts, ghc_install_scripts, ghc_register_pkg,
    ghc_unregister_pkg with cabal_pkg_conf
- allow (ghc to) override ghc_version
2009-12-11 18:17:07 +00:00
Jens Petersen
d007836b70 make ghc_pkg_ver only return pkg version 2009-11-16 12:27:56 +00:00
Jens Petersen
b8f63cfff0 change GHCRequires to ghc_pkg_ver 2009-11-16 09:56:31 +00:00
Jens Petersen
32ffe2c854 use the latest installed pkg version for %GHCRequires 2009-11-16 09:14:11 +00:00
Jens Petersen
5edaabc998 add %GHCRequires for automatically versioned library deps 2009-11-16 07:45:33 +00:00