Commit graph

112 commits

Author SHA1 Message Date
John Ericson 5d116251db
Merge pull request #37707 from obsidiansystems/gettext-setup-hook-cross
gettext, libiconv: Make setup hook work for cross
2018-03-23 15:21:43 -04:00
John Ericson 1482c3c8d8 gettext: Make setup hook work for cross 2018-03-23 12:07:11 -04:00
Will Dietz b59fd70210 gettext: don't add -lintl on musl, either
gettext won't actually provide libintl unless we go out of
our way to tell it to do so [1][2].

We could add those flags on musl (as I initially did in [3]),
but then we have two different libintl.h files and generally
some confusion about which gettext is being used.

Instead of sorting that out, for now let's just continue on
without gettext providing libintl-- it's worked well enough so far.

Only change that needs to be made, then, is to avoid
adding -lintl on musl since there is no libintl.

[1] c739240fd2
[2] https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libintl/libintl-0.19.8.1.ebuild?id=332e48712b6521697f992f923c9c985482dd1c36#n41
[3] 729302f29a
2018-03-23 03:04:55 -05:00
Matthew Bauer 0a2ef04359 gettext: fixup 2018-03-22 16:50:16 -05:00
Matthew Bauer d9aaae5579 gettext: disable hook when libc == glibc 2018-03-22 16:50:15 -05:00
Matthew Bauer 90c132c7f1 gettext: add -lintl to setup-hook 2018-03-22 16:50:10 -05:00
Sarah Brofeldt 95ecb1f203 gettext: Don't use envHooks anymore 2018-01-06 15:11:12 +01:00
Orivej Desh a5c832f1af gettext: add setup hook populating GETTEXTDATADIRS
Fixes #32296

(cherry picked from commit f727aeb4505a9646eb7f7d67ed0fd411900b570c)
2017-12-04 15:26:52 +00:00
Vladimír Čunát 16cf448933
gettext, gcc5: enable stackprotector now
This has been forgotten in #29349 ?
2017-09-19 17:52:32 +02:00
John Ericson 2cc7f1a731 gettext: libiconv should be a buildInput 2017-08-30 16:49:52 -04:00
Tuomas Tynkkynen 1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
David McFarland b92840487e gettext: fix cygwin build 2017-06-26 09:33:19 -03:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Rahul Gopinath 2dca0444fa gettext: 0.19.7 -> 0.19.8 2016-07-09 16:47:53 +02:00
Eric Litak 78f7933829 infinite recursion and cross-build fix 2016-05-31 09:33:32 -07:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Vladimír Čunát afaf1c2f77 gettext: remove crossAttrs
They seem not needed anymore.
2016-04-23 10:52:00 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm f05bc0444a gettext: 0.19.6 -> 0.19.7
expat is replaced by a bundled version of libxml2
2016-02-22 22:47:45 +00:00
zimbatm 05d4959251 gettext: expand all gettext.sh paths 2016-02-22 22:47:45 +00:00
Robin Gloster 402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00:00
Robin Gloster bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Vladimír Čunát 74bda15a94 gettext.sh: fixup calls to absolute paths
For discussion see https://github.com/NixOS/nixpkgs/pull/13072
2016-02-17 18:16:20 +01:00
Robin Gloster f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz 954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Arseniy Seroka 7d02a16aec gettext: fix absolute path 2015-12-14 22:56:34 +03:00
Vladimír Čunát dd915f82e7 expat: split dev output 2015-10-28 10:09:34 +01:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Lancelot SIX 090f27859c gettext: 0.19.5.1 -> 0.19.6 (close #9799) 2015-09-11 18:59:47 +02:00
Eelco Dolstra e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Eelco Dolstra af6ebe817b Remove unused gettext versions 2015-07-27 00:27:19 +02:00
William A. Kennington III 4877451d2e gettext: 0.19.5 -> 0.19.5.1 2015-07-17 14:38:00 -07:00
William A. Kennington III 35664f4569 gettext: 0.19.4 -> 0.19.5 2015-07-17 14:37:11 -07:00
Jude Taylor fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Marko Durkovic b658196c6c cygwin: libiconv and gettext for x86_64 2015-05-28 10:53:34 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Luca Bruno d4a0cd2a94 Add gettextWithExpat function 2015-04-25 11:48:23 +02:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
William A. Kennington III 762861670c gettext: Make 0.19 the default 2015-03-26 12:01:45 -07:00
Vladimír Čunát 4b58636c0d Revert "gettext: fix build on darwin"
This reverts commit fc15721871.

I trusted the referred comment (and maybe misunderstood it),
but the commit wasn't a good idea at all.
2015-03-10 18:09:03 +01:00
Vladimír Čunát fc15721871 gettext: fix build on darwin
Hash on Linuxes is unchanged. For details about the error see discussion at:
https://github.com/NixOS/nixpkgs/commit/0ffb98828e87612
2015-03-10 17:38:29 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Patrick Mahoney 70e7b34470 gettext: add derivation for 0.19 series 2015-01-10 13:26:01 -06:00
aszlig f4edebfa12
gettext: Check for existence of stdenv.ccCross.
Should only affect cross-builds, however I didn't test whether
cross-building gettext actually works. But if it's broken now, it was
broken before as well and this at least unbreaks the non-cross-built
nixpkgs tarball job :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-03 18:27:41 +01:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Mateusz Kowalczyk b186aa8f80 gettext-0.17: meta.branch 2014-09-30 10:56:12 +01:00