Commit ff53ffea authored by Carsten Schoenert's avatar Carsten Schoenert

rebuild patch queue from patch-queue branch

removed patches (added upstream or cherry-picked previously):
fixes/configure.ac-add-additional-linker-flags-for-bsd.patch
fixes/use-strerror-instead-of-sys_errlist.patch
reproducible/Allow-one-to-override-build-date.patch
parent 3f274d98
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Sun, 14 Oct 2018 14:30:42 +0200
Subject: configure.ac: add additional linker flags for *bsd
FreeBSD and OpenBSD platforms needing some extra linker flags.
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 37162fb..b91b887 100644
--- a/configure.ac
+++ b/configure.ac
@@ -926,11 +926,11 @@ if test "x$enable_xspice" = xyes; then
;;
*freebsd* )
AC_DEFINE([IPC_UNIX_SOCKETS], [1], [Client-Server via socket.])
- XSPICEDLLIBS=""
+ XSPICEDLLIBS="-ldl"
;;
*openbsd* )
AC_DEFINE([IPC_UNIX_SOCKETS], [1], [Client-Server via socket.])
- XSPICEDLLIBS=""
+ XSPICEDLLIBS="-ldl"
;;
* )
AC_DEFINE([IPC_UNIX_SOCKETS], [1], [Client-Server via socket.])
......@@ -11,10 +11,10 @@ Just fix up some small spelling issues on the words 'failed' and
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 6f1874a..bf0a968 100644
index 7788e80..1fd7fd1 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -3035,7 +3035,7 @@ inp_get_func_from_line(struct function_env *env, char *line)
@@ -3119,7 +3119,7 @@ inp_get_func_from_line(struct function_env *env, char *line)
Lerror:
// fixme, free()
......@@ -24,7 +24,7 @@ index 6f1874a..bf0a968 100644
}
diff --git a/src/spicelib/devices/hisim2/hsm2set.c b/src/spicelib/devices/hisim2/hsm2set.c
index c66a7ec..5425c32 100644
index 70ee766..be54ac7 100644
--- a/src/spicelib/devices/hisim2/hsm2set.c
+++ b/src/spicelib/devices/hisim2/hsm2set.c
@@ -172,13 +172,13 @@ int HSM2setup(
......
......@@ -54,7 +54,7 @@ index d2e5c64..663533f 100644
IOP( "vecb", B4SOI_MOD_VECB, IF_REAL, "Vaux parameter for conduction-band electron tunneling"),
IOP( "alphagb2", B4SOI_MOD_ALPHAGB2, IF_REAL, "First Vox dependent parameter for gate current in accumulation"),
diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c
index a45f360..cc22f95 100644
index 1fdfd59..563e3c3 100644
--- a/src/spicelib/parser/inpdomod.c
+++ b/src/spicelib/parser/inpdomod.c
@@ -162,14 +162,14 @@ char *INPdomodel(CKTcircuit *ckt, struct card *image, INPtables * tab)
......
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sun, 14 Oct 2018 10:32:35 +0200
Subject: use strerror instead of sys_errlist
sys_errlist isn't available on GNU/Hurd, using strerror which is
available on all platforms.
---
src/include/ngspice/ngspice.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/include/ngspice/ngspice.h b/src/include/ngspice/ngspice.h
index 69cce02..2308670 100644
--- a/src/include/ngspice/ngspice.h
+++ b/src/include/ngspice/ngspice.h
@@ -280,7 +280,7 @@ extern int tcl_fprintf(FILE *f, const char *format, ...);
#define fprintf tcl_fprintf
#undef perror
-#define perror(string) fprintf(stderr,"%s: %s\n",string,sys_errlist[errno])
+#define perror(string) fprintf(stderr,"%s: %s\n",string,strerror(errno))
#elif defined SHARED_MODULE
@@ -307,7 +307,7 @@ extern void SetAnalyse(char *analyse, int percent);
#define fprintf sh_fprintf
#undef perror
-#define perror(string) fprintf(stderr, "%s: %s\n", string, sys_errlist[errno])
+#define perror(string) fprintf(stderr,"%s: %s\n",string,strerror(errno))
#undef fputs
#define fputs sh_fputs
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Fri, 15 Jun 2018 20:40:24 +0200
Subject: Allow one to override build date
in order to make builds reproducible.
See https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable.
This date call only works with GNU date.
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 2352e5d..37162fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -809,7 +809,8 @@ else
AC_DEFINE_UNQUOTED([NGSPICEBINDIR], ["`echo $dprefix/bin`"], [Define the directory for executables])
AC_DEFINE_UNQUOTED([NGSPICEDATADIR], ["`echo $dprefix/share/ngspice`"], [Define the directory for architecture independent data files])
fi
-AC_DEFINE_UNQUOTED([NGSPICEBUILDDATE], ["`date`"], [Define the build date])
+BUILD_DATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}")"
+AC_DEFINE_UNQUOTED([NGSPICEBUILDDATE], ["$BUILD_DATE"], [Define the build date])
if test "x$with_wingui" = xyes; then
AC_MSG_RESULT([WINDOWS GUI code enabled])
fixes/spelling-fixing-some-misspelled-words.patch
fixes/spelling-fixing-more-misspelled-words.patch
fixes/use-strerror-instead-of-sys_errlist.patch
reproducible/Allow-one-to-override-build-date.patch
fixes/configure.ac-add-additional-linker-flags-for-bsd.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment