Commit Graph

86 Commits

Author SHA1 Message Date
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
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
3a48002a94 reenable dynlink on arm archs; condition _defaultlicensedir 2016-11-25 11:20:05 +09:00
Jens Petersen
9c211a6a35 add a comment about -Wunused-label for aarch64
can be removed for ghc-8.0
2016-10-26 17:48:51 +09:00
Jens Petersen
55f359cbaa disable dynlinking on aarch64 and set LDFLAGS again 2016-10-17 12:14:17 +09:00
Jens Petersen
deba8275bf ghc-pkg-wrapper output is simple now 2016-10-17 11:37:36 +09:00
Jens Petersen
28274f8b3a only pass CFLAGS and LDFLAGS to ghc if set 2016-10-17 11:37:21 +09:00
Jens Petersen
46a6bfd423 try not setting CFLAGS and LDFLAGS for aarch64 (for ghc-7.10.3)
- -Wall is very noisy (unused warnings)
- dynlink failing
2016-10-17 10:48:52 +09:00
Jens Petersen
411d61ddf0 new ghc_fix_rpath macro deprecates ghc_fix_dynamic_rpath
- ghc-pkg-wrapper: quieter and simple output
- ghc_libs_install now runs ghc_fix_rpath to fix subpackage rpaths
2016-09-27 14:30:59 +09:00
Jens Petersen
83eef9382a drop %ghc_licensedir and look for license correctly 2016-09-06 19:09:36 +09:00
Jens Petersen
d0eef0681b licensedir fixes 2016-09-06 11:45:19 +09:00
Jens Petersen
68da07a47a set Cabal docdir to licensedir
so licenses end up in right place
2016-09-06 11:20:41 +09:00
Jens Petersen
52dc56db34 additional fixes for handling binlib packages 2016-08-31 11:14:00 +09:00
Jens Petersen
701fee7294 %ghc_gen_filelists: improve license handling for binlib packages 2016-08-31 10:02:44 +09:00
Jens Petersen
452a250213 fix %license path when not subpackaging 2016-08-27 12:13:06 +02:00
Jens Petersen
64dfda4d2c _defaultlicensedir not _licensedir 2016-08-26 18:16:55 +02:00
Jens Petersen
c43600a4a0 ghc_gen_filelists: support packages with multiple license files
move licenses out of docdir instead of removing, also for ghc_bin_install
2016-08-26 14:21:24 +02:00
Jens Petersen
84a7696ad1 move license handling from %ghc_libs_install to %ghc_gen_filelists 2016-08-25 19:12:58 +02:00