rpms/ghc-rpm-macros
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
386 Commits 30 Branches 42 Tags 1.3 MiB
5c4bfea95e
Commit Graph

297 Commits

Author SHA1 Message Date
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
Jens Petersen
3a48002a94 reenable dynlink on arm archs; condition _defaultlicensedir 2016-11-25 11:20:05 +09:00
Jens Petersen
a3ef23ec78 only disable arm dynlinking for f26 (binutils, #1386126) 2016-10-31 12:22:20 +09:00
Jens Petersen
37e9abdf73 don't list %{ix86} twice 2016-10-27 11:39:16 +09:00
Jens Petersen
ebdd0063dd make ghc_lib_subpackage backward compatible with older 2 arg form 2016-10-26 17:53:13 +09:00
Jens Petersen
1f50906382 disable dynlinking on armv7hl too 
also fails with:

libHS<pkg>-<version>-<hash>-ghc7.10.3.so: error: undefined reference to 'log'
 2016-10-17 15:46:29 +09:00
Jens Petersen
55f359cbaa disable dynlinking on aarch64 and set LDFLAGS again 2016-10-17 12:14:17 +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
e3aad73232 drop the Agda obsoletes 2016-10-12 18:36:12 +09:00
Jens Petersen
ef1f187fbb ghc_pkg_recache got versioned ghc-pkg last year 2016-10-12 18:35:29 +09:00
Jens Petersen
54d5511eb7 add obsoletes for idris 2016-10-04 19:42:47 +09:00
Jens Petersen
a9571f976d use %license 2016-09-28 12:47:36 +09:00
Jens Petersen
e107a783d5 add extra requires for chrpath 2016-09-27 17:43:58 +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
68da07a47a set Cabal docdir to licensedir 
so licenses end up in right place
 2016-09-06 11:20:41 +09:00
Jens Petersen
8539a717fc %ghc_lib_subpackage now takes name-version processed with lua 2016-09-01 14:59:29 +09:00
Jens Petersen
701fee7294 %ghc_gen_filelists: improve license handling for binlib packages 2016-08-31 10:02:44 +09: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
Jens Petersen
40e1493069 rename to %ghc_libs_build and %ghc_libs_install 
from %ghc_sublib_*
 2016-08-18 15:25:17 +09:00
Jens Petersen
0592593f31 drop _smp_mflags for now since it can overwhelm armv7hl 2016-08-17 19:01:03 +09:00
Jens Petersen
986f88ae73 2 new macros to ease bundling libraries 
- ghc_sublib_build and ghc_sublib_install
 2016-08-17 17:34:46 +09:00
Jens Petersen
27b17fb15e merge cabal_verbose from github 
thanks mimi1vx for the original patch
 2016-08-06 17:28:06 +02:00
Jens Petersen
2596046682 obsolete Agda temporarily 
to see if it quietens the rawhide report
 2016-07-22 12:28:06 +09:00
Jens Petersen
a1d8cc2ddc obsoletes for more packages retired for f25 
cmdtheline, concrete-typerep, glade, bluetile, lambdabot-utils, haddock, monad-unify
 2016-07-20 19:35:40 +09:00
Jens Petersen
84c32ecae9 obsoletes for hakyll and leksah-server 2016-06-22 17:12:14 +09:00
Jens Petersen
41e9ee727e %ghc_gen_filelists: uniq keyname to prevent build failure for installed version 2016-06-13 16:16:29 +09:00
Jens Petersen
d364972a87 disable debuginfo again 
at least until work out how to get it working
 2016-06-06 17:22:42 +09:00
Jens Petersen
7e15be0963 backport changes from ghc-7.10.3 copr as 1.6.0 
- ghc_gen_filelists: determine keyname with pkgnamever not just pkgname
  (fixes building newer version of installed package)
- use _rpmconfigdir macro
- support el6 (no fileattrs or /usr/lib/rpm/macros.d)
- change url to github
- add and use ghc-pkg-wrapper script
- use ghc-pkg key field (for ghc-7.10)
- configure libsubdir using pkgkey like ghc-cabal
- handle no ghc-srpm-macros for fedora < 21
- fix ghc-pkg path in ghc-deps.sh for ghc-7.10
- version ghc-pkg in ghc_pkg_recache
- update ghc_gen_filelists to use new keyed library filepaths
  and specify libHS*.so more loosely
- ghc-dep.sh now just makes versioned devel reqs
- rename ghc_lib.attr to ghc.attr and drop ghc_bin.attr

- enable debuginfo package
 2016-06-03 13:19:05 +09:00
Jens Petersen
a619695bba obsolete citeproc-hs 2016-03-08 11:02:18 +09:00
Dennis Gilmore
e7a174af5b - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 21:42:59 +00:00
Jens Petersen
d609014ce9 tests comment in macros.ghc 2015-10-08 19:20:20 +09:00
Jens Petersen
d5bd4b883e reenable dynamic linking for aarch64 (#1195231) 2015-06-17 15:42:01 +09:00
Jens Petersen
bf5ed29b0f add leksah to ghc-obsoletes 2015-05-25 19:23:32 +09:00
Jens Petersen
c5902ba33f %cabal now uses utf8 locale; set %ghc_without_dynamic on aarch64 2015-05-07 19:14:08 +09:00
Jens Petersen
e5d78dcff4 add explicit --enable-shared again for arm64 2015-04-02 12:52:27 +09:00
Jens Petersen
0c236fe8e5 fix ghc-deps.sh for ghc builds: use .a files again instead of .conf 
- .conf handling broke since ghc .conf filenames include hash
- now extract pkg-ver from filename rather than dir (for 7.10 support)
- ignore prof libs
 2015-03-23 17:49:30 +09:00
Jens Petersen
cfbdfc60ac add ghc_pkgdocdir for RHEL compatibility 
no _pkgdocdir in current RHEL
 2015-03-20 17:39:03 +09:00
Jens Petersen
f0f6b5560d allow overriding ghc- prefix with %ghc_name (for ghc784 etc) 2015-03-07 22:38:07 +09:00
Jens Petersen
53322a25a5 add ghc-obsoletes subpackage 
- obsoletes ForSyDe, parameterized-data, type-level, and cgi
- currently only for F22+
 2015-03-06 16:32:41 +09:00
Jens Petersen
0b6b0198da fix ghc-deps.sh to handle obsoleted meta libraries 
use --disable-shared for %ghc_without_shared
 2015-03-02 13:21:32 +09:00
Jens Petersen
c2213a0236 turn off hardening in %cabal_configure: set %_hardened_ldflags to %nil 
%ghc_lib_build* was too late
 2015-02-28 00:58:30 +09:00
Jens Petersen
a706fe5472 bump to 1.4.9 2015-02-27 22:58:03 +09:00
Jens Petersen
47247e4150 turn off _hardened_build for libs since it breaks linking 
With "%_hardened_build 1" errors like:

  /usr/bin/ld: -r and -shared may not be used together

and

  /usr/bin/ld.gold: fatal error: -pie and -r are incompatible

occur when building libraries
 2015-02-27 22:57:15 +09:00
Jens Petersen
81726e4857 drop %cabal_tests_not_working since not all tests failing on ARMv7 2015-02-01 07:56:35 +00:00
Jens Petersen
efcc8cce75 %cabal_tests_not_working fixes: add %cabal_test 
correct the arch
 2015-01-31 20:22:21 +00:00
Jens Petersen
9460154623 touch %{basepkg}.files so that %files -f works for meta packages 2015-01-31 18:14:30 +00:00
Jens Petersen
c13aaea995 don't run cabal haddock for meta libraries 2015-01-31 18:03:52 +00:00
Jens Petersen
d80a2ea958 disable Cabal tests on armv7 since they give internal error 2015-01-31 17:38:02 +00:00
Jens Petersen
edf9be1b39 fix the R*PATH regexp 2015-01-31 10:44:28 +00:00
Jens Petersen
07399a8849 on arm chrpath outputs RUNPATH= instead of RPATH= 
%ghc_fix_dynamic_rpath now handles both program names and absolute paths
 2015-01-31 09:43:03 +00:00
Jens Petersen
856d8134b6 version ghcpkgdocdir and add new html doc dir names 
(ghcpkgdocdir used by JuicyPixels)

in future:

%ghcdocbasedir -> %ghc_html_dir
%ghclibdocdir -> %ghc_html_libraries_dir
%ghcpkgdocdir -> %ghc_html_libraries_dir

Hopefully the new names should be clearer
 2015-01-22 16:58:30 +09:00
Jens Petersen
170e2188e9 add a changelog for the cabal-tweak-flag error msg fix 2015-01-22 10:29:03 +09:00
Jens Petersen
4b3c2433d5 version doc htmldirs again 
haddock generates versioned cross-links anyway!

This reverts commit c7830b0.
 2015-01-18 15:26:18 +09:00
Jens Petersen
a93d10698f enable shared libraries and dynamic linking on all archs; disable debuginfo 
- ghc-7.8 support dynamic libs and linking on all arches now
- ghc-7.10 will support dwarf debugging output
 2015-01-17 14:40:38 +09:00
Jens Petersen
c62456812e split ghc.attr into ghc_lib.attr and ghc_bin.attr; require ghc-compiler 
- allows handling executables more precisely and not assume bindir
- avoid "ghc: command not found" error when ghc wasn't installed
 2014-11-14 18:03:42 +09:00
Jens Petersen
83e7a4f045 pass CFLAGS and LDFLAGS to ghc via %cabal_configure 
thanks to Ville for pushing for this in #1138982
and Sergei Trofimovich for explaining how Archlinux does it
 2014-10-27 11:52:27 +09:00
Jens Petersen
87f872d02b ghc-deps.sh: also support ghc-pkg for ghc build before 7.6 
Now test for "%buildroot%_bindir/ghc-pkg-$GHC_VER" and if it exists it means
we are doing a ghc build and then condition on GHC_VER to set GHC_PKG.
Otherwise just use %_bindir/ghc-pkg-$GHC_VER as usual.

There are 3 cases: 7.8, 7.6, and earlier.
 2014-10-23 15:48:27 +09:00
Jens Petersen
9914f51b1b add $ to ghc.attr library path; update changelog date 2014-10-16 17:04:18 +09:00
Jens Petersen
33502e39eb ghc.attr needs to handle requires for /usr/bin files too 2014-10-16 15:51:29 +09:00
Jens Petersen
2da26f9db5 improve %ghc_fix_dynamic_rpath not to assume cwd = pkg_name 2014-09-10 16:07:29 +09:00
Jens Petersen
3efe41dd0c no longer disable debuginfo by default 
cblrpm checks if there are C files in a package
if not it disables debuginfo
 2014-08-29 16:04:33 +09:00
Jens Petersen
19ad5a530b drop -O2 for ghc-7.8 
it uses too much build mem

eg
- highlighting-kate OOM with 4GB ram
- happy needs > 3GB
 2014-08-28 17:34:35 +09:00
Jens Petersen
8479b07853 disable shared/dyn for non-intel until we move to ghc-7.8 2014-08-22 11:48:32 +09:00
Jens Petersen
d02dbabc22 add ghc.attr for running ghc-deps.sh and use internal rpm dep generator 
- update test-rebuild.sh to f22 for master
 2014-08-21 15:34:31 +09:00
Jens Petersen
7a5198b86b fix warning in macros.ghc-extra about unused %pkgnamever 2014-08-20 22:09:31 +09:00
Peter Robinson
c4f882c42c - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 15:44:07 +00:00
Jens Petersen
8598900333 ready for ghc-7.8: no longer need execstack hack nor disable dyn on non-intel 2014-08-03 23:29:14 +09:00
Jens Petersen
88337f50f5 macros.ghc-srpm moved to separate ghc-srpm-macros src package 2014-06-27 10:57:08 +09:00
Jens Petersen
4ef4fab228 add aarch64; and ppc64le hscolour 2014-06-06 19:57:00 +09:00
Jens Petersen
72f890df77 adding missing ppc64 and s390* archs and new ppc64le to ghc_arches 2014-06-01 17:56:21 +09:00
Jens Petersen
06868afd57 fix version in latest changelog 2014-06-01 17:42:43 +09:00
Jens Petersen
69ab773f59 condition use of execstack since no prelink on ppc64le or arm64 2014-05-30 18:25:07 +09:00
Dennis Gilmore
e91dddece5 add %ghc_arches back to macros.ghc-srpm to maintain compatability with 
- existing specs
 2014-05-21 09:21:45 -05:00
Jens Petersen
e3136771b3 rename macros source files removing ghc-rpm- prefix 2014-05-17 17:29:11 +09:00
Jens Petersen
972cb47448 do bcond cabal configure --enable-tests for both Bin and Lib pkgs 2014-05-16 23:47:47 +09:00
Jens Petersen
0273f7e1eb enable configure bcond check for tests 2014-05-16 23:25:42 +09:00
Jens Petersen
e67c7efd4d use -O2 also for executable (Bin) packages and allow it to be overrided 2014-05-13 18:29:22 +09:00
Jens Petersen
48199c851a fix new requires, build on all archs and make hscolour conditional on arch 
- ghc-srpm-macros subpackage noarch
- set Url field when generating subpackages
 2014-04-30 12:44:15 +09:00
Jens Petersen
eaa615f948 move macros.ghc-srpm from redhat-rpm-config to new ghc-srpm-macros 
update license tag to GPLv3+
 2014-04-28 19:16:03 +09:00
Jens Petersen
8f2ef1279a no _pkgdocdir in RHEL7 and docdir path different to F20+ 2014-03-28 17:40:33 +09:00
Jens Petersen
671df91867 abort ghc_fix_dynamic_rpath if no chrpath 2014-03-17 12:24:45 +09:00
Jens Petersen
f67d26b5d6 quote %ghc_lib_build in changelog 2014-02-27 10:32:52 +09:00
Ville Skyttä
98b6135469 Install macros to %{_rpmconfigdir}/macros.d. 
https://lists.fedoraproject.org/pipermail/devel/2014-January/195026.html
 2014-02-14 00:02:58 +02:00
Jens Petersen
e4c93cb77e set datasubdir in cabal_configure for ghc-7.8 
pkg datadir should not be arch dependent!
 2014-02-10 18:36:05 +09:00
Jens Petersen
3ec60c7a31 quote ghc_fix_dynamic_rpath error message 2014-01-10 11:48:58 +09:00
Jens Petersen
caadeff016 bump version 2014-01-10 10:56:25 +09:00
Jens Petersen
4d2eb25803 add ghcpkgdocdir 
allows for unversioned haddock dirs similarly to _pkgdocdir
 2013-10-15 18:08:08 +09:00
Jens Petersen
795c0c522b ghc-deps.sh: fix ghc-pkg path when bootstrapping new ghc version 
ghc-7.7 has bin subdir
 2013-09-10 12:42:26 +09:00
Jens Petersen
0cd6abba00 fix ghc-deps.sh when bootstrapping a new ghc version 
ie do not assume bindir/ghc is the same ghc version just built
 2013-09-09 23:17:35 +09:00
Jens Petersen
db486c2fbb use objdump -p instead of ldd to read executable dependencies 
hopefully more robust against ghc-7.7's relocatable dynamic linking
 2013-09-09 22:55:47 +09:00