[PATCH 3/4] gnu: bootstrap: Add the location of where ld.so is located on Hurd systems.

[PATCH 3/4] gnu: bootstrap: Add the location of where ld.so is located on Hurd systems.

[Marek Benc]

[-- Attachment #1: Type: text/plain, Size: 56 bytes --]

This one should be pretty self explanatory.

-- 
Marek.

[-- Attachment #2: git-patch-3.patch --]
[-- Type: text/x-patch, Size: 989 bytes --]

From 098ca112becb95199d3e66078b75fbf5b9b54a69 Mon Sep 17 00:00:00 2001
From: Marek Benc <dusxmt@gmx.com>
Date: Thu, 5 Feb 2015 17:07:18 +0100
Subject: [PATCH] gnu: bootstrap: Add the location of where ld.so is located on
 Hurd systems.

* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add the dynamic linker for i686-gnu.

---
 gnu/packages/bootstrap.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 71ccb19..6a8d09a 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -156,6 +156,7 @@ check whether everything is alright."
   (cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2")
         ((string=? system "i686-linux") "/lib/ld-linux.so.2")
         ((string=? system "mips64el-linux") "/lib/ld.so.1")
+        ((string=? system "i686-gnu") "/lib/ld.so.1")
         (else (error "dynamic linker name not known for this system"
                      system))))
 
-- 
2.2.1

Re: [PATCH 3/4] gnu: bootstrap: Add the location of where ld.so is located on Hurd systems.

[Manolis Ragkousis]

On 5 February 2015 at 16:29, Marek Benc <dusxmt@gmx.com> wrote:
> This one should be pretty self explanatory.

I have done the same on my local branch so this one can be safely
applied on wip-hurd branch.

Re: [PATCH 3/4] gnu: bootstrap: Add the location of where ld.so is located on Hurd systems.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> On 5 February 2015 at 16:29, Marek Benc <dusxmt@gmx.com> wrote:
>> This one should be pretty self explanatory.
>
> I have done the same on my local branch so this one can be safely
> applied on wip-hurd branch.

Could you push this patch to wip-hurd?

Thanks,
Ludo’.

Re: [PATCH 3/4] gnu: bootstrap: Add the location of where ld.so is located on Hurd systems.

[Manolis Ragkousis]

Pushed.

Thanks,
Manolis

[PATCH 3/4] gnu: bootstrap: Add the location of where ld.so is located on Hurd systems.

[Manolis Ragkousis]

[-- Attachment #1: Type: text/plain, Size: 53 bytes --]

Nothing changed here. Just rebased on top of master.

[-- Attachment #2: 0003-gnu-bootstrap-Add-the-location-of-where-ld.so-is-loc.patch --]
[-- Type: text/x-patch, Size: 1149 bytes --]

From 457aa5858bb1698385cd6bd9174e61d832da2590 Mon Sep 17 00:00:00 2001
From: Marek Benc <dusxmt@gmx.com>
Date: Thu, 5 Feb 2015 17:07:18 +0100
Subject: [PATCH 3/4] gnu: bootstrap: Add the location of where ld.so is
 located on Hurd systems.

* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add the dynamic linker for i686-gnu.

Signed-off-by: Manolis Ragkousis <manolis837@gmail.com>
---
 gnu/packages/bootstrap.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 1f0fe16..48e3178 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -164,7 +164,8 @@ successful, or false to signal an error."
         ((string=? system "i686-linux") "/lib/ld-linux.so.2")
         ((string=? system "armhf-linux") "/lib/ld-linux-armhf.so.3")
         ((string=? system "mips64el-linux") "/lib/ld.so.1")
-
+        ((string=? system "i686-gnu") "/lib/ld.so.1")
+        
         ;; XXX: This one is used bare-bones, without a libc, so add a case
         ;; here just so we can keep going.
         ((string=? system "xtensa-elf") "no-ld.so")
-- 
2.3.0