Jens Petersen
c13aaea995
don't run cabal haddock for meta libraries
10 years ago
Jens Petersen
d80a2ea958
disable Cabal tests on armv7 since they give internal error
10 years ago
Jens Petersen
edf9be1b39
fix the R*PATH regexp
10 years ago
Jens Petersen
07399a8849
on arm chrpath outputs RUNPATH= instead of RPATH=
...
%ghc_fix_dynamic_rpath now handles both program names and absolute paths
10 years ago
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
10 years ago
Jens Petersen
170e2188e9
add a changelog for the cabal-tweak-flag error msg fix
10 years ago
Jens Petersen
4b3c2433d5
version doc htmldirs again
...
haddock generates versioned cross-links anyway!
This reverts commit c7830b0
.
10 years ago
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
10 years ago
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
10 years ago
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
10 years ago
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.
10 years ago
Jens Petersen
9914f51b1b
add $ to ghc.attr library path; update changelog date
10 years ago
Jens Petersen
33502e39eb
ghc.attr needs to handle requires for /usr/bin files too
10 years ago
Jens Petersen
2da26f9db5
improve %ghc_fix_dynamic_rpath not to assume cwd = pkg_name
10 years ago
Jens Petersen
3efe41dd0c
no longer disable debuginfo by default
...
cblrpm checks if there are C files in a package
if not it disables debuginfo
10 years ago
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
10 years ago
Jens Petersen
8479b07853
disable shared/dyn for non-intel until we move to ghc-7.8
11 years ago
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
11 years ago
Jens Petersen
7a5198b86b
fix warning in macros.ghc-extra about unused %pkgnamever
11 years ago
Peter Robinson
c4f882c42c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
11 years ago
Jens Petersen
8598900333
ready for ghc-7.8: no longer need execstack hack nor disable dyn on non-intel
11 years ago
Jens Petersen
88337f50f5
macros.ghc-srpm moved to separate ghc-srpm-macros src package
11 years ago
Jens Petersen
4ef4fab228
add aarch64; and ppc64le hscolour
11 years ago
Jens Petersen
72f890df77
adding missing ppc64 and s390* archs and new ppc64le to ghc_arches
11 years ago
Jens Petersen
06868afd57
fix version in latest changelog
11 years ago
Jens Petersen
69ab773f59
condition use of execstack since no prelink on ppc64le or arm64
11 years ago
Dennis Gilmore
e91dddece5
add %ghc_arches back to macros.ghc-srpm to maintain compatability with
...
- existing specs
11 years ago
Jens Petersen
e3136771b3
rename macros source files removing ghc-rpm- prefix
11 years ago
Jens Petersen
972cb47448
do bcond cabal configure --enable-tests for both Bin and Lib pkgs
11 years ago
Jens Petersen
0273f7e1eb
enable configure bcond check for tests
11 years ago
Jens Petersen
e67c7efd4d
use -O2 also for executable (Bin) packages and allow it to be overrided
11 years ago
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
11 years ago
Jens Petersen
eaa615f948
move macros.ghc-srpm from redhat-rpm-config to new ghc-srpm-macros
...
update license tag to GPLv3+
11 years ago
Jens Petersen
8f2ef1279a
no _pkgdocdir in RHEL7 and docdir path different to F20+
11 years ago
Jens Petersen
671df91867
abort ghc_fix_dynamic_rpath if no chrpath
11 years ago
Jens Petersen
f67d26b5d6
quote %ghc_lib_build in changelog
11 years ago
Ville Skyttä
98b6135469
Install macros to %{_rpmconfigdir}/macros.d.
...
https://lists.fedoraproject.org/pipermail/devel/2014-January/195026.html
11 years ago
Jens Petersen
e4c93cb77e
set datasubdir in cabal_configure for ghc-7.8
...
pkg datadir should not be arch dependent!
11 years ago
Jens Petersen
3ec60c7a31
quote ghc_fix_dynamic_rpath error message
11 years ago
Jens Petersen
caadeff016
bump version
11 years ago
Jens Petersen
4d2eb25803
add ghcpkgdocdir
...
allows for unversioned haddock dirs similarly to _pkgdocdir
11 years ago
Jens Petersen
795c0c522b
ghc-deps.sh: fix ghc-pkg path when bootstrapping new ghc version
...
ghc-7.7 has bin subdir
11 years ago
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
11 years ago
Jens Petersen
db486c2fbb
use objdump -p instead of ldd to read executable dependencies
...
hopefully more robust against ghc-7.7's relocatable dynamic linking
11 years ago
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
11 years ago
Jens Petersen
c7830b0a64
unversion htmldir's like pkg docdir's; drop ghc_docdir
12 years ago
Jens Petersen
8bc7b06720
add %ghc_docdir for package's docdir
...
I think rpm or at least redhat-rpm-config should provide such a macro
12 years ago
Jens Petersen
40a7e828d4
also make %ghc_lib_build docdir unversioned
...
require redhat-rpm-config >= 9.1.0-50.fc20
12 years ago
Jens Petersen
e5c7bca0e8
in F20 docdir's are now unversioned
...
https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
12 years ago
Jens Petersen
2e67bb2ce5
check for bindir before looking for executables in ghc_clear_execstack
12 years ago
Jens Petersen
49912b0df5
add ghc_clear_execstack and use it also in ghc_lib_install
12 years ago
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
12 years ago
Jens Petersen
f0c10c9f13
only configure with --global if not subpackaging libs
12 years ago
Jens Petersen
e08038a4a4
reenable hscolour
12 years ago
Jens Petersen
328fc11463
turn off hscolour for bootstrap
12 years ago
Jens Petersen
3790c3a7fb
add --global to %cabal_configure; bump to 1.0
12 years ago
Jens Petersen
54b338816d
merge remaining extra macros into %ghc_lib_subpackage
12 years ago
Jens Petersen
80fec1cbd1
configure builds with ghc -O2 ( #880135 )
12 years ago
Jens Petersen
9761c94426
drop -h option from extra macros and make -m work again
12 years ago
Jens Petersen
6910d07de7
for ghc-7.6 use --global-package-db and --no-user-package-db
12 years ago
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
12 years ago
Ralf Corsépius
9921428d92
Remove %config from %{_sysconfdir}/rpm/macros.*
...
(https://fedorahosted.org/fpc/ticket/259 ).
12 years ago
Jens Petersen
15903c519c
add changelog entries for %pkgdir fix and %ghc_with_lib_for_ghci
12 years ago
Dennis Gilmore
6153b67702
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
12 years ago
Jens Petersen
11c364e456
simplify cabal-tweak-flag script to take one flag value
12 years ago
Jens Petersen
436bfaf65d
%ghc_fix_dynamic_rpath for cleaning up executables linked against own libs
12 years ago
Jens Petersen
59daf96cb2
make only ghc-PKG own libdir/ghc-ver/pkg-ver/ ( #893777 )
...
thanks to Michael Scherer for reporting
12 years ago
Jens Petersen
6af89aa214
add cabal-tweak-flag script for toggling flag default
12 years ago
Jens Petersen
4add3928b3
re-enable hscolour
12 years ago
Jens Petersen
548aff606e
bootstrap hscolour
12 years ago
Jens Petersen
44c764437c
revert also the doc indexing changes from the spec file
12 years ago
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.
12 years ago
Jens Petersen
9e0aa2550c
bring back doc re-indexing in posttrans using /var/lib/rpm-state/ghc/
12 years ago
Jens Petersen
bda56fd9b1
BR redhat-rpm-config not ghc-rpm-macros; don't set without_hscolour in macros.ghc
12 years ago
Jens Petersen
20b1088ae2
fix missing html haddock output
12 years ago
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
12 years ago
Jens Petersen
5d116cb4cc
no need to BR hscolour
12 years ago
Jens Petersen
a23376405b
fix broken duplicate hash output for haskell-platform binaries when locally installed
12 years ago
Jens Petersen
e330117e14
fix missing %endif
12 years ago
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
12 years ago
Jens Petersen
befa5e103e
make haddock build hoogle files, no longer need to disable building ghci lib files
13 years ago
Jens Petersen
ae161ab66c
update the upstream comment in the spec file
13 years ago
Dennis Gilmore
1d2eebf689
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
13 years ago
Jens Petersen
ac776c377e
provide doc from devel again to silence rpmlint warning
13 years ago
Jens Petersen
20cbe43332
cabal-tweak-dep-ver: match complete dep name and not beyond ","
13 years ago
Jens Petersen
59008edb14
cabal-tweak-dep-ver: make a backup file the first time
13 years ago
Jens Petersen
1cb0fba5fb
cabal-tweak-dep-ver: quote wildcards in match string and show file name when no match
13 years ago
Jens Petersen
7cdea6ff7e
replace %cabal_tweak_dep_ver with cabal-tweak-dep-ver script
...
rpmbuild doesn't handle spaces in quoted args
13 years ago
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
13 years ago
Jens Petersen
8e22621418
ghc-dep.sh: only use buildroot package.conf.d if it exists
13 years ago
Jens Petersen
1b8536abf1
ghc-deps.sh: look in buildroot package.conf.d for program deps
13 years ago
Jens Petersen
c013051271
add a meta-package option to ghc_devel_package and use in ghc_devel_requires
13 years ago
Jens Petersen
dae8fa2606
let ghc_bin_install take an arg to disable implicit stripping for subpackages
13 years ago
Jens Petersen
fa247e69af
ghc_description, ghc_devel_description, ghc_devel_post_postun can take args
13 years ago
Jens Petersen
bbc5f8f364
fix doc handling of subpackages for ghc_without_shared
13 years ago
Jens Petersen
8fc16e2daa
without ghc_exclude_docdir include doc dir also for subpackages
13 years ago
Jens Petersen
64b3d676b2
add changelog for previous commit: --disable-library-for-ghci and common_summary
13 years ago
Jens Petersen
88a603f537
disable generating ghci .o files by default; add variable cabal_configure_extra_options to cabal_configure
13 years ago
Jens Petersen
5abcaaca33
add ghc_lib_build_without_haddock; no longer drop into subpackage dirs
13 years ago
Jens Petersen
89972ec757
add changelog about rename ghc_binlib_package to ghc_lib_subpackage
13 years ago
Jens Petersen
6b6cf52f6d
don't build .o when no ghci; support meta-packages; optional common_summary and common_description
...
- only build ghci .o library files on ghc_arches_with_ghci
- support meta packages like haskell-platform without base lib files
- make it possible not to have to use common_summary and common_description
13 years ago
Jens Petersen
7ffdbdc6d5
change of rpm metadata hash format for new ghc-7.4
...
- drop prof meta hash data
- no longer include doc files automatically by default
- no longer provide doc subpackage
- do not provide prof when without_prof set
13 years ago
Jens Petersen
8cf968c984
fix handling of devel docdir for non-shared builds
...
- simplify ghc_bootstrap
13 years ago
Jens Petersen
ab41e2f6c8
allow dynamic linking of Setup with ghc_without_shared set
13 years ago
Jens Petersen
488948b8d7
clarify changelog to mention filelist
13 years ago
Jens Petersen
fe1a0f23ee
ghc_add_basepkg_file adds path to base lib package filelist
13 years ago
Jens Petersen
2089fc7bf1
add ghc_devel_post_postun to help koji
13 years ago
Jens Petersen
19872dc6fe
add ghc_package, ghc_description, ghc_devel_package, ghc_devel_description
13 years ago
Jens Petersen
227b33e94e
bump to 0.15
13 years ago
Jens Petersen
683aba9d80
new ghc_files wrapper macro which takes base doc files as args
...
- uses new ghc_shared_files and ghc_devel_files macros
13 years ago
Jens Petersen
72e5db37b5
use ghc system config when compiling Setup; don't setup hscolour if without_hscolour
13 years ago
Jens Petersen
d32b4577e8
test for HsColour directly in "cabal haddock" instead of using without_haddock
13 years ago
Jens Petersen
b1204c472c
fix double listing of docdir in base lib package
13 years ago
Jens Petersen
fb65ca3a00
also disable testsuite in ghc_bootstrap
13 years ago
Jens Petersen
7229f10396
replace devel ghc requires with ghc-compiler
13 years ago
Jens Petersen
0b163b3d06
add ghc_bootstrapping to ghc_bootstrap; fix ghc-deps.sh when bootstrapping
13 years ago
Jens Petersen
bd7f38e058
add ghc_exclude_docdir to exclude docdir from filelists
13 years ago
Jens Petersen
fb1984734b
fix devel subpackage's prof and doc obsoletes and provides versions
13 years ago
Jens Petersen
5995766e80
don't use ghc-deps.sh when ghc_bootstrapping; add %ghc_test config
13 years ago
Jens Petersen
dfb8f0169d
drop without_testsuite from ghc_bootstrap since it breaks koji
14 years ago
Jens Petersen
f0b5c1b565
drop defattr's; move depgen setup to ghc_lib_install
14 years ago
Jens Petersen
283779dff1
requires redhat-rpm-config for ghc_arches
14 years ago
Jens Petersen
4773ef18ac
ghc_bootstrap: add ghc_without_dynamic and drop without_hscolour
14 years ago
Jens Petersen
e6a0b6cbfe
change ghc_bootstrap to a macro that disables shared and prof libs, docs, and testsuite
...
- ghc_bootstrap is now a macro which sets ghc_bootstrapping,
ghc_without_shared, without_prof, without_haddock, without_hscolour,
without_manual, without_testsuite
- tweaks to ghc_check_bootstrap
14 years ago
Jens Petersen
ed9a00f761
add ghc_check_bootstrap
14 years ago
Jens Petersen
232d0166b5
rename back to macros.ghc again; revert previous devel summary ordering change
14 years ago
Jens Petersen
4b65f2f48e
move macros back to /etc/rpm and add %macro_file
14 years ago
Jens Petersen
e29cbf2a99
fix the file for macros.ghc move
14 years ago
Jens Petersen
da128f954a
move macros.ghc to /usr/lib/rpm to avoid conflict with redhat-rpm-config
14 years ago
Jens Petersen
1bc67af711
merge prof subpackages into devel to simplify packaging
14 years ago
Jens Petersen
eab5583c0d
include ghc_pkg_c_deps even when -c option used
14 years ago
Jens Petersen
8af86b797a
drop ghc_pkg_deps from ghc_package_devel and ghc_package_prof
14 years ago
Jens Petersen
cbf3d70e56
provides ghc-*-doc still needed for current lib templates
14 years ago
Jens Petersen
cd30bb3547
check PKGBASEDIR, ghc bootstrapping, ghc_reindex_haddock nop, drop ghc-*-doc provides
...
- ghc-deps.sh: check PKGBASEDIR exists to avoid warning for bin package
- abort cabal_configure if ghc is not self-bootstrapped
- make ghc_reindex_haddock a safe no-op
- no longer provide ghc-*-doc
- no longer run ghc_reindex_haddock in ghc-*-devel scripts
14 years ago
Jens Petersen
82b34c5629
add ghc_pkg_obsoletes to shared lib package too
14 years ago
Jens Petersen
30ceea2628
add docdir when subpackaging packages too
14 years ago
Jens Petersen
c9936dc158
subminor version bump
14 years ago
Jens Petersen
b2d74bab08
fix the defines of ghc_without_dynamic and ghc_without_shared
14 years ago
Jens Petersen
75e22924a6
fix macro.ghc path for cat
14 years ago
Jens Petersen
2c0b10d5d5
disable shared and dynamic on secondary archs
...
- this package is now arch-dependent
- rename without_shared to ghc_without_shared and without_dynamic
to ghc_without_dynamic so that they can be globally defined for
secondary archs without shared libs
- use %%undefined macro
- disable debug_package in ghc_bin_build and ghc_lib_build
- set ghc_without_shared and ghc_without_dynamic on secondary
(ie non main intel archs)
- disable debuginfo for self
14 years ago
Jens Petersen
26005406d3
revert setting without_shared and without_dynamic on secondary archs
14 years ago
Jens Petersen
30f51fc80d
more non-shared fixes to avoid dynamic and shared on secondary archs
...
- only link Setup dynamically if without_shared and without_dynamic not set
- set without_shared and without_dynamic by default on secondary archs
in cabal_bin_build and cabal_lib_build
- add cabal_configure_options to pass extra options to cabal_configure
14 years ago
Jens Petersen
1f4312aeaa
fix ghc-deps.sh for without_shared libraries
14 years ago
Dennis Gilmore
ee9ff3e826
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
14 years ago
Jens Petersen
876ea626db
simplify adding shared subpackage license file; own ghc-deps.sh not /usr/lib/rpm
14 years ago
Jens Petersen
a1abcaaa78
add rpm hash requires for dynamic executables in ghc-deps.sh
...
- compile Setup in cabal macro
- use _rpmconfigdir
14 years ago
Jens Petersen
b13abaef50
bunch of tweaks, cleanup, and improvements
...
- drop deprecated ghcdocdir and ghcpkgdir
- new ghclibdocdir
- replace some missed RPM_BUILD_ROOT's
- bring back ghc requires in ghc_devel_requires
- improve prof summary and description
- add without_prof and without_haddock option macros
14 years ago
Jens Petersen
0f8bb5330b
compile Setup to help speed up builds
14 years ago
Jens Petersen
4d6720d40f
make sure license is in binlib shared subpackage and add option to exclude package from ghc_packages_list
...
- put docdir (license) also into shared lib subpackage
- add ghc_binlib_package option to exclude package from ghc_packages_list
- condition lib base package additional description for srpm
14 years ago
Jens Petersen
086f1bc5e0
more ghc libraries subpackaging fixes and other cleanup
...
- use buildroot instead of RPM_BUILD_ROOT
- rename ghcpkgbasedir to ghclibdir
- split "[name-version]" args into "[name] [version]" args
- move remaining name and version macro options (-n and -v) to args
- drop deprecated -o options
14 years ago