* [PATCH] gnu: gnupg: Add missing triplet file for i586-gnu systems.
@ 2015-07-03 19:44 Manolis Ragkousis
2015-07-03 20:20 ` Andreas Enge
2015-07-04 14:38 ` Ludovic Courtès
0 siblings, 2 replies; 4+ messages in thread
From: Manolis Ragkousis @ 2015-07-03 19:44 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: Guix-devel
[-- Attachment #1: Type: text/plain, Size: 301 bytes --]
Hello
While trying to build libgpg-error for target i586-pc-gnu it failed,
because lock-obj-pub.i586-pc-gnu.h was missing. It seems that
just copying lock-obj-pub.i486-pc-gnu.h to i586 does the trick. WDYT?
Found a similar case here.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764881
Manolis
[-- Attachment #2: 0001-gnu-gnupg-Add-missing-triplet-file-for-i586-gnu-syst.patch --]
[-- Type: text/x-patch, Size: 3240 bytes --]
From dfc1abe834f1d7f17fb6068dd5d1f20318097c1d Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Fri, 3 Jul 2015 21:55:31 +0300
Subject: [PATCH] gnu: gnupg: Add missing triplet file for i586-gnu systems.
* gnu/packages/gnupg.scm (libgpg-error): Apply patch.
* gnu/packages/patches/libgpg-hurd-add-triplet.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
---
gnu-system.am | 1 +
gnu/packages/gnupg.scm | 4 ++-
gnu/packages/patches/libgpg-hurd-add-triplet.patch | 33 ++++++++++++++++++++++
3 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/libgpg-hurd-add-triplet.patch
diff --git a/gnu-system.am b/gnu-system.am
index 630845d..8d6cac4 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -464,6 +464,7 @@ dist_patch_DATA = \
gnu/packages/patches/libbonobo-activation-test-race.patch \
gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \
gnu/packages/patches/libevent-dns-tests.patch \
+ gnu/packages/patches/libgpg-hurd-add-triplet.patch \
gnu/packages/patches/liboop-mips64-deplibs-fix.patch \
gnu/packages/patches/libmad-mips-newgcc.patch \
gnu/packages/patches/libpthread-remove-duplicate.patch \
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index a9f1f12..46a4d88 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -32,6 +32,7 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
@@ -47,7 +48,8 @@
version ".tar.bz2"))
(sha256
(base32
- "0408v19h3h0q6w61g51hgbdg6cyw81nyzkh70qfprvsc3pkddwcz"))))
+ "0408v19h3h0q6w61g51hgbdg6cyw81nyzkh70qfprvsc3pkddwcz"))
+ (patches (list (search-patch "libgpg-hurd-add-triplet.patch")))))
(build-system gnu-build-system)
(home-page "http://gnupg.org")
(synopsis "Library of error values for GnuPG components")
diff --git a/gnu/packages/patches/libgpg-hurd-add-triplet.patch b/gnu/packages/patches/libgpg-hurd-add-triplet.patch
new file mode 100644
index 0000000..c9d8acd
--- /dev/null
+++ b/gnu/packages/patches/libgpg-hurd-add-triplet.patch
@@ -0,0 +1,33 @@
+diff --git a/src/syscfg/lock-obj-pub.i586-pc-gnu.h b/src/syscfg/lock-obj-pub.i586-pc-gnu.h
+new file mode 100644
+index 0000000..59b61e1
+--- /dev/null
++++ b/src/syscfg/lock-obj-pub.i586-pc-gnu.h
+@@ -0,0 +1,24 @@
++## lock-obj-pub.i586-pc-gnu.h
++## File created by gen-posix-lock-obj - DO NOT EDIT
++## To be included by mkheader into gpg-error.h
++
++typedef struct
++{
++ long _vers;
++ union {
++ volatile char _priv[32];
++ long _x_align;
++ long *_xp_align;
++ } u;
++} gpgrt_lock_t;
++
++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
++ 0,0,0,0,0,0,0,0, \
++ 0,0,0,0,0,0,0,0, \
++ 0,0,0,0,0,0,0,0}}}
++##
++## Local Variables:
++## mode: c
++## buffer-read-only: t
++## End:
++##
+--
+2.4.5
+
--
2.4.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: gnupg: Add missing triplet file for i586-gnu systems.
2015-07-03 19:44 [PATCH] gnu: gnupg: Add missing triplet file for i586-gnu systems Manolis Ragkousis
@ 2015-07-03 20:20 ` Andreas Enge
2015-07-04 14:36 ` Ludovic Courtès
2015-07-04 14:38 ` Ludovic Courtès
1 sibling, 1 reply; 4+ messages in thread
From: Andreas Enge @ 2015-07-03 20:20 UTC (permalink / raw)
To: Manolis Ragkousis; +Cc: Guix-devel
On Fri, Jul 03, 2015 at 10:44:30PM +0300, Manolis Ragkousis wrote:
> While trying to build libgpg-error for target i586-pc-gnu it failed,
> because lock-obj-pub.i586-pc-gnu.h was missing. It seems that
> just copying lock-obj-pub.i486-pc-gnu.h to i586 does the trick. WDYT?
> Found a similar case here.
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764881
This looks like the good thing to do, or maybe create a symbolic link
in a pre-configure phase instead, or maybe rename the file - is the i486
one still of any use, or is it a deprecated target in gcc?
There is a new libgpg-error version 1.19, which would need to be updated
in a new core-updates cycle, but it suffers from the same problem.
So I think it would be good if you could file a bug upstream also.
Thanks!
Andreas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: gnupg: Add missing triplet file for i586-gnu systems.
2015-07-03 20:20 ` Andreas Enge
@ 2015-07-04 14:36 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2015-07-04 14:36 UTC (permalink / raw)
To: Andreas Enge; +Cc: Guix-devel
Andreas Enge <andreas@enge.fr> skribis:
> There is a new libgpg-error version 1.19, which would need to be updated
> in a new core-updates cycle, but it suffers from the same problem.
libgpg-error is not a “core” package, but it’s true that almost 700
packages depend on it. So we should at least perform the upgrade, apply
the patch, and upgrade related libraries (libassuan, etc.) in new
‘gpg-update’ branch, and let Hydra build it.
> So I think it would be good if you could file a bug upstream also.
Definitely!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: gnupg: Add missing triplet file for i586-gnu systems.
2015-07-03 19:44 [PATCH] gnu: gnupg: Add missing triplet file for i586-gnu systems Manolis Ragkousis
2015-07-03 20:20 ` Andreas Enge
@ 2015-07-04 14:38 ` Ludovic Courtès
1 sibling, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2015-07-04 14:38 UTC (permalink / raw)
To: Manolis Ragkousis; +Cc: Guix-devel
Manolis Ragkousis <manolis837@gmail.com> skribis:
> --- /dev/null
> +++ b/gnu/packages/patches/libgpg-hurd-add-triplet.patch
> @@ -0,0 +1,33 @@
> +diff --git a/src/syscfg/lock-obj-pub.i586-pc-gnu.h b/src/syscfg/lock-obj-pub.i586-pc-gnu.h
> +new file mode 100644
> +index 0000000..59b61e1
> +--- /dev/null
> ++++ b/src/syscfg/lock-obj-pub.i586-pc-gnu.h
> +@@ -0,0 +1,24 @@
As usual, please mention in the patch what it does, where it comes from,
and what its upstream status is.
Could you send an updated patch?
TIA!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-04 14:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-03 19:44 [PATCH] gnu: gnupg: Add missing triplet file for i586-gnu systems Manolis Ragkousis
2015-07-03 20:20 ` Andreas Enge
2015-07-04 14:36 ` Ludovic Courtès
2015-07-04 14:38 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.