diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 36 | ||||
| -rw-r--r-- | gnu/packages/gettext.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/glibc-locales.patch | 31 |
3 files changed, 69 insertions, 2 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 2de9bc2d81..ca440c242c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages texinfo) #:use-module (gnu packages pkg-config) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -503,6 +504,41 @@ with the Linux kernel.") (license lgpl2.0+) (home-page "http://www.gnu.org/software/libc/"))) +(define-public glibc-locales + (package + (inherit glibc) + (name "glibc-locales") + (source (origin (inherit (package-source glibc)) + (patches (cons (search-patch "glibc-locales.patch") + (origin-patches (package-source glibc)))))) + (synopsis "All the locales supported by the GNU C Library") + (description + "This package provides all the locales supported by the GNU C Library, +more than 400 in total. To use them set the 'LOCPATH' environment variable to +the 'share/locale' sub-directory of this package.") + (outputs '("out")) ;110+ MiB + (native-search-paths '()) + (arguments + (let ((args `(#:tests? #f #:strip-binaries? #f + ,@(package-arguments glibc)))) + (substitute-keyword-arguments args + ((#:phases phases) + `(alist-replace + 'build + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Delete $out/bin, which contains 'bash'. + (delete-file-recursively (string-append out "/bin"))) + + (zero? (system* "make" "localedata/install-locales" + "-j" (number->string (parallel-job-count))))) + (alist-delete 'install ,phases))) + ((#:configure-flags flags) + `(append ,flags + (list (string-append "libc_cv_localedir=" + (assoc-ref %outputs "out") + "/share/locale"))))))))) + (define-public tzdata (package (name "tzdata") diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index dd86fe4c5b..af8876f9d6 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -18,7 +18,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages gettext) - #:use-module ((guix licenses) #:select (gpl3)) + #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) @@ -78,4 +78,4 @@ textual output of programs into multiple languages. It provides translators with the means to create message catalogs, as well as an Emacs mode to work with them, and a runtime library to load translated messages from the catalogs. Nearly all GNU packages use Gettext.") - (license gpl3))) ; some files are under GPLv2+ + (license gpl3+))) ;some files are under GPLv2+ diff --git a/gnu/packages/patches/glibc-locales.patch b/gnu/packages/patches/glibc-locales.patch new file mode 100644 index 0000000000..1d254e1c1d --- /dev/null +++ b/gnu/packages/patches/glibc-locales.patch @@ -0,0 +1,31 @@ +This patch allows us to use glibc's build system to build locales +in a package separate from glibc. + + 1. Use 'localedef' from $PATH since we are not rebuilding it. + 2. Use '--no-archive' to avoid building the big locale archive, and + because the already-built 'localedef' would want to write it + to '/run/current-system/locale', which is not possible. + 3. Pass $(localedir)/$$locale to install files in the right place, and + because otherwise, 'localedef' fails with: + "cannot write output files to `(null)'". + +--- glibc-2.20/localedata/Makefile 2014-09-07 10:09:09.000000000 +0200 ++++ glibc-2.20/localedata/Makefile 2015-02-11 10:23:55.560545568 +0100 +@@ -217,7 +217,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix in + + # Sometimes the whole collection of locale files should be installed. + LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ +-$(rtld-prefix) $(common-objpfx)locale/localedef ++ localedef --no-archive + install-locales: $(INSTALL-SUPPORTED-LOCALES) + + install-locales-dir: +@@ -234,7 +234,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo + input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ + $(LOCALEDEF) --alias-file=../intl/locale.alias \ + -i locales/$$input -c -f charmaps/$$charset \ +- $(addprefix --prefix=,$(install_root)) $$locale; \ ++ $(addprefix --prefix=,$(install_root)) $(localedir)/$$locale; \ + echo ' done'; \ + + tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP |