Commit Graph

106 Commits

Author SHA1 Message Date
Jens Petersen
07a1493141 drop deprecated %ghc_fix_dynamic_rpath
deprecated since Sept 2016
2019-07-31 10:03:52 +00: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
fcee7ff4cb always build Setup with -no-user-package-db 2019-02-16 13:07:12 +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
b82b10135e use haddock --hyperlink-source unconditionally 2019-02-02 01:15:55 +08:00
Jens Petersen
e35da2ef75 disable debuginfo by undefining _enable_debug_packages 2019-02-02 01:15:02 +08: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
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
7de08b499a disable dynamic linking of executables for better portability 2018-10-05 17:58:58 +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
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
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
1ffadfb29d drop ghc_bootstrapping from comment in macros.ghc 2018-02-28 17:47:10 +09:00
Jens Petersen
47ac404ddc no longer need to prune -z defs from LDFLAGS 2018-02-04 00:08:03 +09: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
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
32c4fa64af add %ghc_set_cflags macro 2017-12-04 21:24:21 +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
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
5969f32695 add %_ghclicensedir and %ghc_smp_mflags macros
backport from github
2017-07-30 21:05:03 +01:00
Jens Petersen
38f99a79b3 fix %ghc_fix_rpath for ghc-7.10 2017-04-07 19:09:23 +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
195cbddf39 %ghc_fix_dynamic_rpath define lowercase RPATH 2017-03-16 13:15:39 +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