Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a054bfbdf493f37a525658af03c4abb03d4167f9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a054bfbdf493f37a525658af03c4abb03d4167f9)
  • Date: Thu, 15 Apr 2021 12:27:28 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/scute/BUILD
| 2
crypto/scute/DETAILS
| 2
crypto/scute/HISTORY
| 4
crypto/scute/PRE_BUILD
| 3

crypto/scute/patches/0001-Do-not-declare-global-variable-in-header-file.patch
| 55 ++++++++++
devel/llvm/DETAILS
| 2
devel/llvm/HISTORY
| 3
7 files changed, 69 insertions(+), 2 deletions(-)

New commits:
commit a054bfbdf493f37a525658af03c4abb03d4167f9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

llvm: => 12.0.0

commit d8a502945d93634b1f34df6c4f21c032cc07e731
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

scute: => 1.7.0

diff --git a/crypto/scute/BUILD b/crypto/scute/BUILD
new file mode 100755
index 0000000..d4a24df
--- /dev/null
+++ b/crypto/scute/BUILD
@@ -0,0 +1,2 @@
+OPTS+="--disable-doc" &&
+default_build
diff --git a/crypto/scute/DETAILS b/crypto/scute/DETAILS
index add0f26..9b867e9 100755
--- a/crypto/scute/DETAILS
+++ b/crypto/scute/DETAILS
@@ -1,5 +1,5 @@
SPELL=scute
- VERSION=1.6.0
+ VERSION=1.7.0

SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=https://gnupg.org/ftp/gcrypt/scute/$SOURCE
diff --git a/crypto/scute/HISTORY b/crypto/scute/HISTORY
index 70851a4..7f1b30d 100644
--- a/crypto/scute/HISTORY
+++ b/crypto/scute/HISTORY
@@ -1,3 +1,7 @@
+2021-04-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.0
+ * BUILD, PRE_BUILD, patches/: added - fix build
+
2020-12-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.0

diff --git a/crypto/scute/PRE_BUILD b/crypto/scute/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/crypto/scute/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git
a/crypto/scute/patches/0001-Do-not-declare-global-variable-in-header-file.patch

b/crypto/scute/patches/0001-Do-not-declare-global-variable-in-header-file.patch
new file mode 100644
index 0000000..b43ce93
--- /dev/null
+++
b/crypto/scute/patches/0001-Do-not-declare-global-variable-in-header-file.patch
@@ -0,0 +1,55 @@
+From 49ad2b0e05e3fcb8c8c2e23bb1c6063b390dee02 Mon Sep 17 00:00:00 2001
+From: Damien Goutte-Gattat <dgouttegattat AT incenp.org>
+Date: Tue, 30 Mar 2021 22:31:40 +0100
+Subject: [PATCH] Do not declare global variable in header file.
+
+* src/options.h (_scute_opt_t): New typedef.
+(_scute_opt): Declare as extern and move definition to ...
+* src/readconf.c (_scute_opt): here.
+--
+
+This fixes build with gcc-10, which has -fno-common enabled by
+default.
+
+GnuPG-bug-id: 5360
+Signed-off-by: Damien Goutte-Gattat <dgouttegattat AT incenp.org>
+---
+ src/options.h | 6 ++++--
+ src/readconf.c | 2 ++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/options.h b/src/options.h
+index 10667db..d74071d 100644
+--- a/src/options.h
++++ b/src/options.h
+@@ -22,10 +22,12 @@
+ #define OPTIONS_H 1
+
+ /* Global options. */
+-struct {
++typedef struct {
+ char *user;
+ int debug_flags;
+-} _scute_opt;
++} _scute_opt_t;
++
++extern _scute_opt_t _scute_opt;
+
+
+ /*-- readconf.c --*/
+diff --git a/src/readconf.c b/src/readconf.c
+index 387a44f..5af2336 100644
+--- a/src/readconf.c
++++ b/src/readconf.c
+@@ -31,6 +31,8 @@
+
+ #include "options.h"
+
++_scute_opt_t _scute_opt;
++
+ static const char *
+ my_strusage (int level)
+ {
+--
+2.31.1
+
diff --git a/devel/llvm/DETAILS b/devel/llvm/DETAILS
index 5f18d04..21cdd9c 100755
--- a/devel/llvm/DETAILS
+++ b/devel/llvm/DETAILS
@@ -1,5 +1,5 @@
SPELL=llvm
- VERSION=11.1.0
+ VERSION=12.0.0
SOURCE="${SPELL}-${VERSION}.src.tar.xz"
SOURCE2=$SOURCE.sig

GITHUB_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$VERSION";
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 09f63a6..1c10593 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,6 @@
+2021-04-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 12.0.0
+
2021-02-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 11.1.0





Archive powered by MHonArc 2.6.24.

Top of Page