Commit Graph

388 Commits

Author SHA1 Message Date
Jens Petersen
338a2e11bc %ghc_lib_subpackage -m for meta subpackages 2020-07-13 12:01:44 +08:00
Jens Petersen
bc06ab77b4 only add dynlib to filelist if found to allow for metapkg subpackage
eg base-noprelude subpackage of pandoc
2020-06-24 19:00:44 +08:00
Jens Petersen
31a55c3bc9 cabal-tweak-*: output errors to stderr with scriptname 2020-06-18 11:08:33 +08:00
Jens Petersen
0bb1bc2091 doc subpackages should own %{_docdir}/ghc/html/libraries/ and parents (#1795526) 2020-06-04 12:45:56 +08:00
Jens Petersen
1f6b86fa4b ghc-deps.sh: ignore internal libraries (#1822444) 2020-05-10 21:49:27 +08:00
Jens Petersen
0957e8f99b obsolete ghc-here 2020-05-08 19:11:35 +08:00
Jens Petersen
3e574ed460 use -package Cabal to build Setup 2020-04-27 21:42:47 +08:00
Jens Petersen
2e646e6ade obsolete cabal-helper and ghc-derive, and unobsolete hgettext 2020-03-03 23:49:28 +08:00
Jens Petersen
640d44dbc6 ghc-deps.sh: fix prof deps for subpackages 2020-02-10 18:54:19 +08:00
Fedora Release Engineering
94dd010461 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 21:18:19 +00:00
Jens Petersen
7d23ad27b7 obsolete FTBFS ghc-hgettext 2020-01-27 17:57:00 +08:00
Jens Petersen
55f3bb578e Revert "add %ghc_devel_prof config to handle devel/prof lib BRs"
This reverts commit f5201b70db.

Could define it in ghc-srpm-macros
2019-09-27 23:45:23 +08:00
Jens Petersen
f5201b70db add %ghc_devel_prof config to handle devel/prof lib BRs 2019-09-27 18:06:47 +08:00
Jens Petersen
bf725e3e8b fix ghc-deps.sh generation of prof deps
broken in 2.0.3 - now should correctly glob for installed prof libs
2019-08-27 16:45:37 +03:00
Jens Petersen
f4b0280742 add cabal-tweak-remove-upperbound 2019-08-13 17:31:29 +02:00
Jens Petersen
8532ad674a ghc-deps.sh: only depend on ghc-prof(pkgid) if libHS*_p.a exists
testcase: haskell-gi-overloading dummy package
2019-08-10 22:46:33 +02:00
Jens Petersen
a11ad68d65 check if doc haddock dir exists 2019-08-07 14:07:56 +02:00
Jens Petersen
c0416597f5 ghc_lib_subpackage: provide static with isa suffix 2019-08-05 18:51:19 +08:00
Jens Petersen
aa3330b0d6 fixup changelog dates 2019-07-31 10:16:47 +00:00
Jens Petersen
7c7ff554ce implement doc and prof subpackages 2019-07-31 10:05:10 +00:00
Jens Petersen
6cca56615f bump to version 1.10 2019-07-31 10:05:10 +00:00
Fedora Release Engineering
a7912ec0d8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 02:56:16 +00:00
Jens Petersen
aeff5cde90 obsolete ghc-conduit-combinators base package already in f30 2019-05-18 15:57:21 +08:00
Jens Petersen
945207835e add remaining f30 obsoletes 2019-05-11 01:02:09 +08:00
Jens Petersen
03ef976954 strip with Cabal again; obsolete ghc-hoopl
unfortunately libs and exe's were not getting stripped by rpm
2019-04-15 18:15:27 +08:00
Jens Petersen
5a531e47b6 re-instate ghc_without_shared since useful for standalone builds 2019-04-09 19:21:22 +08:00
Jens Petersen
14a65baa2a %ghc_fix_rpath was a no-op for ghc_without_dynamic 2019-02-24 13:53:26 +08:00
Jens Petersen
c1326d82af use C.utf8 for building instead of en_US.utf8 2019-02-02 01:21:29 +08:00
Jens Petersen
b60ddd4560 leave stripping to generic rpm macros 2019-02-02 01:17:16 +08:00
Jens Petersen
e35da2ef75 disable debuginfo by undefining _enable_debug_packages 2019-02-02 01:15:02 +08:00
Fedora Release Engineering
c3ba9ccbd8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 21:57:05 +00:00
Jens Petersen
4e2983c83c disable -Werror=format-security too on s390x
cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
cc1: some warnings being treated as errors
`gcc' failed in phase `C Compiler'. (Exit code: 1)
2018-10-25 00:48:27 +09:00
Jens Petersen
5b2544a8cc silence C Wunused-label warnings flood on s390x again 2018-10-25 00:12:12 +09:00
Jens Petersen
298bd4e3dd f29: obsolete content-store, bdcs, and bdcs-api 2018-10-23 16:07:55 +09:00
Jens Petersen
153f50041f keep %ghc_set_gcc_flags name 2018-10-06 01:47:11 +09:00
Jens Petersen
975f21c108 disable hardened ldflags again
only breaks x86_64 and armv7hl for static linking?:

/usr/bin/ld.gold: error: /usr/lib64/ghc-8.2.2/rts/libHSrts_thr.a(MarkWeak.thr_o): requires unsupported dynamic reloc 11; recompile with -fPIC

/usr/bin/ld.gold: error: /usr/lib/ghc-8.2.2/rts/libHSrts_thr.a(GCUtils.thr_o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
2018-10-06 01:13:16 +09:00
Jens Petersen
55f62273c3 %cabal_configure: use %ghc_set_gcc_flags 2018-10-05 19:02:12 +09:00
Jens Petersen
6499cbc4e2 bump for rebuild
for updated rawhide changelog
2018-10-05 18:14:48 +09:00
Jens Petersen
e736d6cdbe add important changelog entry for last commit 2018-10-05 18:13:25 +09:00
Jens Petersen
d190fa9b04 replace %ghc_set_cflags with simplified %ghc_set_gcc_flags
tested in ghc.spec in ghc:8.4 module
2018-10-05 17:58:43 +09:00
Jens Petersen
8bce457cb2 insert a Setup.hs file if none shipped in package
current foundation and rio have no Setup.hs
2018-07-31 01:30:50 +09:00
Jens Petersen
5c4bfea95e remove -Wall and -Werror=format-security separately (for aarch64 and s390x) 2018-07-24 17:44:34 +09:00
Fedora Release Engineering
95e211cd84 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 02:05:26 +00:00
Jens Petersen
37fe2b4ab7 support packaging Cabal bundled internal libraries
for some reason installing with Cabal (rather than cabal-install)
gives different hashes for the sublibrary

simplification of initial work in opensuse by Ondřej Súkup
https://github.com/fedora-haskell/ghc-rpm-macros/pull/7

testcase was haddock-library-1.4.5
2018-05-25 19:24:07 +09:00
Jens Petersen
3124474192 drop %ghc_check_bootstrap and add %ghc_quick_build
- according to upstream it is redundant now to build ghc against itself
- %ghc_quick_build replaces %ghc_bootstrap
2018-05-23 10:49:21 +09:00
Jens Petersen
02ff4a6bb7 obsolete ghc-fail 2018-04-30 19:33:14 +09:00
Jens Petersen
87df4b821c fix text of previous changelog 2018-04-07 22:32:00 +09:00
Jens Petersen
6e6bc8e4a6 fix corruption of eclipseo's name 2018-04-07 22:20:14 +09:00
Robert-André Mauchin
3c4760fac8 Define pkgdir as %{ghclibdir}/%{pkgnamever} instead of %{ghclibdir}/${key} 2018-04-07 12:54:16 +02:00
Jens Petersen
4887078b34 use pkgid for libexecsubdir and libsubdir (#1563863)
libexecsubdir is only available in Cabal 2
2018-04-05 18:33:56 +09:00
Jens Petersen
cae5ea467c obsolete ghc-ltk 2018-03-06 18:10:20 +09:00
Fedora Release Engineering
ae3cfff251 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 12:04:50 +00:00
Jens Petersen
0a4591897c drop the ldconfig scripts since they are not needed for F28 2018-02-04 00:09:19 +09:00
Jens Petersen
47ac404ddc no longer need to prune -z defs from LDFLAGS 2018-02-04 00:08:03 +09:00
Jens Petersen
ca7fad4882 cabal-tweak-drop-dep: quote grep pattern to allow whitespace 2018-01-29 22:21:31 +01:00
Jens Petersen
811c5a99f0 reenable %_ghcdynlibdir for ghc-8.2 building 2018-01-28 08:32:39 +01:00
Jens Petersen
2e2b672417 make the recent dynlib changes conditional on _ghcdynlibdir and disable
(without_shared remains gone)
2018-01-28 08:02:46 +01:00
Jens Petersen
b058836dae no whitespace after '-z defs' 2018-01-25 07:23:26 +01:00
Jens Petersen
ba39d46794 remove "-z defs" from LDFLAGS since it breaks linking
dist/build/Language/Haskell/HsColour.dyn_o:hscolourzm1zi24zi2zmBwYhdEbf2m3fdRy45AMG_LanguageziHaskellziHsColour_zdfShowLit6_info: error: undefined reference to 'newCAF'
:
dist/build/Language/Haskell/HsColour.dyn_o:sQ3F_info: error: undefined reference to 'stg_upd_frame_info'
2018-01-25 07:02:40 +01:00
Jens Petersen
bd0af716de %ghc_fix_rpath: remove leading or trailing ':' 2018-01-23 15:24:11 +01:00
Jens Petersen
1306c9a80d add ldconfig install scripts to ghc_lib_subpackage 2018-01-23 13:27:36 +01:00
Jens Petersen
5f6ff9c55c do not handle ghc libs location specially; ghc-pkg-wrapper rpath 2018-01-23 12:49:58 +01:00
Jens Petersen
bc93aaa088 changes for ghc-8.2: _ghcdynlibdir, drop ghc_without_shared, chrpath
- add _ghcdynlibdir for Cabal --dynlibdir
- dynlibs in _libdir except ghc's libs
- drop ghc_without_shared
- ghc_fix_rpath removes RPATHs for 8.2+
2018-01-22 09:23:36 +01:00
Jens Petersen
f2e3e0f014 drop arch condition on hscolour requires
since package is now noarch
2017-12-14 21:27:43 +09:00
Jens Petersen
0d7493589a update the spec file for last change 2017-12-04 21:29:12 +09:00
Jens Petersen
b838259f68 obsolete ghc-webkit (#1375825) 2017-11-15 18:42:21 +09:00
Jens Petersen
f3be8b6bc2 rename macros.ghc-fedora to macros.ghc-os 2017-11-15 16:25:50 +09:00
Jens Petersen
7faec45fdd use shell variable instead of macro to carry licensedir version 2017-11-15 11:25:18 +09:00
Jens Petersen
97922d41b7 for rhel > 7 noarch and no license dir version 2017-11-14 19:22:31 +09:00
Jens Petersen
3643446b23 -Werror=format-security fails without -Wall 2017-11-10 12:12:46 +09:00
Jens Petersen
272d2b048a do not set -Wall on aarch64 and s390x
-Wunused-label is extremely noisy

[1 of 2] Compiling Text.Html.BlockTable ( Text/Html/BlockTable.hs, dist/build/Text/Html/BlockTable.o )
/tmp/ghcbd98_0/ghc_2.hc: In function ‘htmlzm1zi0zi1zi2zm8wVtehjIxUEBYXzzRus7033_TextziHtmlziBlockTable_getMatrix_entry’:
/tmp/ghcbd98_0/ghc_2.hc:63:1: error:
     warning: label ‘_c2qm’ defined but not used [-Wunused-label]
     _c2qm:
2017-11-10 11:49:21 +09:00
Jens Petersen
ea9bb846fc temporarily set Wall for all archs to see which are noisy 2017-11-10 10:56:09 +09:00
Jens Petersen
ff7270f82d drop the git-annex obsoletes 2017-10-10 15:44:05 +08:00
Jens Petersen
b78d93fec3 fix the package.conf existence check 2017-09-13 19:17:01 +09:00
Jens Petersen
430e328400 make some macro call args explicit for rpm-4.14 scope change 2017-09-13 18:36:31 +09:00
Jens Petersen
5d5eac137c %ghc_gen_filelists: check package.conf exists 2017-08-02 11:07:36 +01:00
Jens Petersen
4c35941d50 changelog: noarch for f27 2017-07-30 21:10:26 +01:00
Jens Petersen
0bab6b0296 make package noarch for f27+ 2017-07-30 21:08:27 +01:00
Jens Petersen
5969f32695 add %_ghclicensedir and %ghc_smp_mflags macros
backport from github
2017-07-30 21:05:03 +01:00
Fedora Release Engineering
2cfb9bdb77 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 09:54:56 +00:00
Jens Petersen
195b0fadb8 obsolete git-annex 2017-05-11 12:19:39 +09:00
Jens Petersen
445740902c update changelog 2017-04-07 19:13:28 +09:00
Jens Petersen
38f99a79b3 fix %ghc_fix_rpath for ghc-7.10 2017-04-07 19:09:23 +09:00
Jens Petersen
7855aaa8f1 ghc-pkg < 8 only accepts pkg-ver not pkg-ver-id_hash 2017-03-26 20:12:10 +09:00
Jens Petersen
c17dd21b04 %cabal_configure now outputs Cabal version 2017-03-26 19:57:33 +09:00
Jens Petersen
78b7c8e144 haddock generation failing since f25 ghc-7.10 due to [ -f *.a] failing 2017-03-24 18:17:14 +09:00
Jens Petersen
7b97799ed4 condition obsoletes on fedora version 2017-03-16 13:29:52 +09:00
Jens Petersen
6ed0be7ab1 add obsoletes for cgi and multipart 2017-03-16 13:17:12 +09:00
Jens Petersen
836ded9751 obsolete geniplate and sized-types 2017-03-12 13:43:32 +09:00
Jens Petersen
2fb629fb9b %ghc_bin_install and %ghc_lib_install now run ghc_fix_rpath on subpkgs 2017-03-03 11:00:57 +09:00
Jens Petersen
b1fc196577 fixes for when (subpackage) pkg-ver already installed
macros.ghc no longer uses ghc-pkg-wrapper

- %ghc_fix_rpath gets lib dir directly by globbing buildroot
- %ghc_gen_filelists reads pkg key from .conf
- ghc-deps.sh: read unique pkg id from .conf

before this preinstalled libs were interfering and this was further
exasperated on ghc8 where .conf filenames are not keyed so we were querying
`ghc-pkg list pkg` instead of pkg-ver.
2017-03-03 10:57:59 +09:00
Jens Petersen
09527a512d subpackages can contain numbers and need --user 2017-02-23 20:58:38 +09:00
Jens Petersen
473b736053 fix fixing of rpaths 2017-02-22 14:50:26 +09:00
Jens Petersen
66fe267a12 fix generation of haddock's 2017-02-22 13:32:26 +09:00
Jens Petersen
df54044203 quieten ppc64 and ppc64le logs by not setting CFLAGS
-Wunused-label very noisy with ghc-7.10

I think this can be dropped for ghc-8.0
2017-02-14 11:12:12 +09:00
Jens Petersen
f1517cd581 fix handling of ghc's .files with new ghc_lib_subpackage -d option 2017-02-13 19:25:12 +09:00
Jens Petersen
89fc8859a1 fix subpackage builds
if %ghc_subpackaging set configure with --user otherwise --global
2017-02-10 12:50:57 +09:00
Jens Petersen
ae0985a107 build subpackages inside main package dir 2017-02-09 10:52:59 +09:00
Jens Petersen
5517c1f361 new cabal-tweak-drop-dep and other merges from github
- no longer use a topdir for subpackage building
- only autopackage license if subpackaging
- move uniq to ghc-pkg-wrapper
- add macros.ghc-fedora for Fedora specific config
- replace cabal_verbose with cabal_configure_verbose, cabal_build_verbose,
  cabal_install_verbose, cabal_haddock_verbose, and cabal_test_verbose
- new _ghcdocdir
2017-02-08 15:26:07 +09:00
Jens Petersen
cab483029e add 4 more F25 obsoletes
for editline, hashed-storage, nats, primes
2016-12-02 13:52:08 +09:00