Commit Graph

252 Commits

Author SHA1 Message Date
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
Jens Petersen a2f7c2b71a update ghc-deps.sh for rts changes as of ghc-7.7.20130828
ghc-7.8 rts now lives in its own subdir
2013-09-07 22:08:03 +09:00
Jens Petersen c7830b0a64 unversion htmldir's like pkg docdir's; drop ghc_docdir 2013-08-27 19:31:45 +09:00
Jens Petersen 8bc7b06720 add %ghc_docdir for package's docdir
I think rpm or at least redhat-rpm-config should provide such a macro
2013-07-26 14:34:17 +09:00
Jens Petersen 40a7e828d4 also make %ghc_lib_build docdir unversioned
require redhat-rpm-config >= 9.1.0-50.fc20
2013-07-26 12:18:47 +09:00
Jens Petersen e5c7bca0e8 in F20 docdir's are now unversioned
https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
2013-07-26 11:40:49 +09:00
Jens Petersen 2e67bb2ce5 check for bindir before looking for executables in ghc_clear_execstack 2013-07-11 10:41:16 +09:00
Jens Petersen 49912b0df5 add ghc_clear_execstack and use it also in ghc_lib_install 2013-07-10 16:32:39 +09:00
Jens Petersen 1b79de9a6f drop doc/prof obsoletes/provides for subpkgs; clear executable stack flag for exec's
- changes are to %ghc_lib_subpackage and %ghc_bin_install
2013-07-10 15:36:54 +09:00
Jens Petersen f0c10c9f13 only configure with --global if not subpackaging libs 2013-06-21 01:41:43 +09:00
Jens Petersen e08038a4a4 reenable hscolour 2013-06-20 17:32:19 +09:00
Jens Petersen 328fc11463 turn off hscolour for bootstrap 2013-06-20 16:36:11 +09:00
Jens Petersen 3790c3a7fb add --global to %cabal_configure; bump to 1.0 2013-06-19 16:36:17 +09:00
Jens Petersen 54b338816d merge remaining extra macros into %ghc_lib_subpackage 2013-06-17 13:49:03 +09:00
Jens Petersen 80fec1cbd1 configure builds with ghc -O2 (#880135) 2013-06-06 17:57:46 +09:00
Jens Petersen 9761c94426 drop -h option from extra macros and make -m work again 2013-06-05 12:43:26 +09:00
Jens Petersen 6910d07de7 for ghc-7.6 use --global-package-db and --no-user-package-db 2013-04-23 20:09:58 +09:00
Jens Petersen 73b0bd180f large update for simplified reworked revision of Packaging Guidelines
- see https://fedorahosted.org/fpc/ticket/194 for discussion
- move section and multiple library metamacros to new extra subpackage
- packaging no longer depends on availability of shared libs
  so is same now for all primary and secondary archs: ie there is always
  a binary base library package
- drop ghc_add_basepkg_file macro and ghc_exclude_docdir
2013-04-23 18:15:11 +09:00
Ralf Corsépius 9921428d92 Remove %config from %{_sysconfdir}/rpm/macros.*
(https://fedorahosted.org/fpc/ticket/259).
2013-03-20 07:55:15 +01:00
Jens Petersen 15903c519c add changelog entries for %pkgdir fix and %ghc_with_lib_for_ghci 2013-02-26 18:39:44 +01:00
Dennis Gilmore 6153b67702 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-13 17:17:21 -06:00
Jens Petersen 11c364e456 simplify cabal-tweak-flag script to take one flag value 2013-01-22 12:22:28 +09:00
Jens Petersen 436bfaf65d %ghc_fix_dynamic_rpath for cleaning up executables linked against own libs 2013-01-22 11:31:08 +09:00
Jens Petersen 59daf96cb2 make only ghc-PKG own libdir/ghc-ver/pkg-ver/ (#893777)
thanks to Michael Scherer for reporting
2013-01-18 18:52:08 +09:00
Jens Petersen 6af89aa214 add cabal-tweak-flag script for toggling flag default 2012-12-03 16:00:06 +09:00
Jens Petersen 4add3928b3 re-enable hscolour 2012-11-17 23:11:03 +09:00
Jens Petersen 548aff606e bootstrap hscolour 2012-11-17 22:34:36 +09:00
Jens Petersen 44c764437c revert also the doc indexing changes from the spec file 2012-11-16 16:38:37 +09:00
Jens Petersen ea552a4daf add haddock reindexing for %postun also
This will slow down removal of ghc-*-devel pkgs but seems no simple
way round that and removal is less common than installing anyway.
2012-10-30 11:00:23 +09:00
Jens Petersen 9e0aa2550c bring back doc re-indexing in posttrans using /var/lib/rpm-state/ghc/ 2012-10-29 20:02:06 +09:00
Jens Petersen bda56fd9b1 BR redhat-rpm-config not ghc-rpm-macros; don't set without_hscolour in macros.ghc 2012-10-25 18:13:54 +09:00
Jens Petersen 20b1088ae2 fix missing html haddock output 2012-10-09 12:28:27 +09:00
Jens Petersen 07fccfd9a1 add comment about for unbootstrapping hscolour; add test-rebuild script for testing changes
so far script gives diffs of requires and provides
2012-10-05 18:55:03 +09:00
Jens Petersen 5d116cb4cc no need to BR hscolour 2012-09-20 12:05:40 +09:00
Jens Petersen a23376405b fix broken duplicate hash output for haskell-platform binaries when locally installed 2012-09-19 20:00:54 +09:00
Jens Petersen e330117e14 fix missing %endif 2012-09-08 21:25:38 +09:00
Jens Petersen b95424a06b ghc-rpm-macros now requires hscolour so packages no longer need to BR it
- this can be disabled for bootstrapping by setting without_hscolour
2012-09-08 21:18:30 +09:00
Jens Petersen befa5e103e make haddock build hoogle files, no longer need to disable building ghci lib files 2012-08-24 22:23:20 +09:00
Jens Petersen ae161ab66c update the upstream comment in the spec file 2012-07-26 16:04:01 +09:00
Dennis Gilmore 1d2eebf689 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-19 00:59:27 -05:00
Jens Petersen ac776c377e provide doc from devel again to silence rpmlint warning 2012-06-25 11:58:19 +09:00
Jens Petersen 20cbe43332 cabal-tweak-dep-ver: match complete dep name and not beyond "," 2012-06-22 17:03:46 +09:00
Jens Petersen 59008edb14 cabal-tweak-dep-ver: make a backup file the first time 2012-06-22 15:21:43 +09:00
Jens Petersen 1cb0fba5fb cabal-tweak-dep-ver: quote wildcards in match string and show file name when no match 2012-06-22 14:47:51 +09:00
Jens Petersen 7cdea6ff7e replace %cabal_tweak_dep_ver with cabal-tweak-dep-ver script
rpmbuild doesn't handle spaces in quoted args
2012-06-22 13:46:59 +09:00
Jens Petersen 8a8de3a39a new cabal_tweak_dep_ver macro for tweaking versions of depends
%cabal_tweak_dep_ver dep old new [backup]
changes old version bound to new for dep with optional backup suffix

eg %cabal_tweak_dep_ver haskell-src-exts 1.12 1.14 2
2012-06-22 12:49:41 +09:00