Re: recipe for gettext master

[Rob Vermaas]

Still getting errors btw: http://hydra.nixos.org/build/3562422

 

On Fri, Dec 21, 2012 at 7:56 PM, Rob Vermaas <address@hidden> wrote:

Applied patch.

On Thu, Dec 20, 2012 at 10:31 PM, Daiki Ueno <address@hidden> wrote:

Rob Vermaas <address@hidden> writes:

> I have created a jobset for gettext master branch, you can see the results at:
> http://hydra.nixos.org/jobset/gnu/gettext-master

Thanks!

> Currently the builds fail as the tarball that is built in tarball job seems
> empty?

From the log:

 tardir=gettext-0.18.1 && ${TAR-tar} chof - --owner=root --group=root "$tardir" | GZIP=--best gzip -c >gettext-0.18.1.tar.gz
 tar: root: Invalid owner
 tar: Error is not recoverable: exiting now

It seems the same treatment as libunistring is needed.  Patch attached.

Regards,
--
Daiki Ueno

>From 09d02c98a8caf2a0e6ff8dc886e242d4bb72891d Mon Sep 17 00:00:00 2001
From: Daiki Ueno <address@hidden>
Date: Fri, 21 Dec 2012 06:23:19 +0900
Subject: [PATCH] gettext: Don't expect a `root' user.

---
 gettext/release.nix                             |    1 +
 gettext/tar-should-not-expect-a-root-user.patch |   17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 gettext/tar-should-not-expect-a-root-user.patch

diff --git a/gettext/release.nix b/gettext/release.nix
index c2cef62..732b307 100644
--- a/gettext/release.nix
+++ b/gettext/release.nix
@@ -63,6 +63,7 @@ in

     customEnv = {
       tarball = pkgs: {

+        patches = [ ./tar-should-not-expect-a-root-user.patch ];

         autoconfPhase = ''
           export GNULIB_TOOL="../gnulib/gnulib-tool"
           ./autogen.sh

diff --git a/gettext/tar-should-not-expect-a-root-user.patch b/gettext/tar-should-not-expect-a-root-user.patch
new file mode 100644
index 0000000..4222a9a
--- /dev/null
+++ b/gettext/tar-should-not-expect-a-root-user.patch
@@ -0,0 +1,17 @@
+Make it so that `make dist' doesn't fail if a `root' user cannot be found,
+which is the case in NixOS chroot builds.
+
+diff --git a/configure.ac b/configure.ac
+index 7c8d2c0..b1cfafc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,9 +24,6 @@ AC_CONFIG_AUX_DIR([build-aux])
+ gl_INIT_PACKAGE([gettext], [$VERSION_NUMBER])
+ AM_INIT_AUTOMAKE([silent-rules])
+
+-dnl Override automake's tar command used for creating distributions.
+-am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
+-
+ dnl Checks for programs.
+
+ dnl Checks for libraries.
--
1.7.10.4

--
Rob Vermaas

[email] address@hidden

--
Rob Vermaas

[email] address@hidden