pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

emacs-git: fix build on NetBSD; update PLIST



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Fri Jan 31 00:02:29 2020 +0100
Changeset:	0f4ec83ad51d8de821f52e7335b4c7a12a328263

Modified Files:
	emacs-git/PLIST
	emacs-git/distinfo
Added Files:
	emacs-git/patches/patch-src_systhread.c

Log Message:
emacs-git: fix build on NetBSD; update PLIST

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0f4ec83ad51d8de821f52e7335b4c7a12a328263

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 emacs-git/PLIST                         |  6 ++++--
 emacs-git/distinfo                      |  1 +
 emacs-git/patches/patch-src_systhread.c | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diffs:
diff --git a/emacs-git/PLIST b/emacs-git/PLIST
index e04d225b5a..815562fb9a 100644
--- a/emacs-git/PLIST
+++ b/emacs-git/PLIST
@@ -2815,6 +2815,8 @@ share/emacs/${PKGVERSION}/lisp/net/sasl-ntlm.el.gz
 share/emacs/${PKGVERSION}/lisp/net/sasl-ntlm.elc
 share/emacs/${PKGVERSION}/lisp/net/sasl-scram-rfc.el.gz
 share/emacs/${PKGVERSION}/lisp/net/sasl-scram-rfc.elc
+share/emacs/${PKGVERSION}/lisp/net/sasl-scram-sha256.el.gz
+share/emacs/${PKGVERSION}/lisp/net/sasl-scram-sha256.elc
 share/emacs/${PKGVERSION}/lisp/net/sasl.el.gz
 share/emacs/${PKGVERSION}/lisp/net/sasl.elc
 share/emacs/${PKGVERSION}/lisp/net/secrets.el.gz
@@ -3011,6 +3013,8 @@ share/emacs/${PKGVERSION}/lisp/obsolete/rcompile.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/rcompile.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/s-region.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/s-region.elc
+share/emacs/${PKGVERSION}/lisp/obsolete/sb-image.el.gz
+share/emacs/${PKGVERSION}/lisp/obsolete/sb-image.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/sregex.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/sregex.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/starttls.el.gz
@@ -3575,8 +3579,6 @@ share/emacs/${PKGVERSION}/lisp/savehist.el.gz
 share/emacs/${PKGVERSION}/lisp/savehist.elc
 share/emacs/${PKGVERSION}/lisp/saveplace.el.gz
 share/emacs/${PKGVERSION}/lisp/saveplace.elc
-share/emacs/${PKGVERSION}/lisp/sb-image.el.gz
-share/emacs/${PKGVERSION}/lisp/sb-image.elc
 share/emacs/${PKGVERSION}/lisp/scroll-all.el.gz
 share/emacs/${PKGVERSION}/lisp/scroll-all.elc
 share/emacs/${PKGVERSION}/lisp/scroll-bar.el.gz
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
index 63f4110da5..69f4650769 100644
--- a/emacs-git/distinfo
+++ b/emacs-git/distinfo
@@ -1,3 +1,4 @@
 $NetBSD$
 
 SHA1 (patch-configure.ac) = c9731094e059ac80d25e5a32894404a14be64433
+SHA1 (patch-src_systhread.c) = 1b27f4f7de6e8efc61852fbbcf4ab638502ed7f8
diff --git a/emacs-git/patches/patch-src_systhread.c b/emacs-git/patches/patch-src_systhread.c
new file mode 100644
index 0000000000..0d8b094e89
--- /dev/null
+++ b/emacs-git/patches/patch-src_systhread.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Adapt pthread_setname_np calling convention for NetBSD.
+
+--- src/systhread.c.orig	2020-01-30 22:42:52.049505198 +0000
++++ src/systhread.c
+@@ -217,7 +217,11 @@ sys_thread_set_name (const char *name)
+  #ifdef HAVE_PTHREAD_SETNAME_NP_1ARG
+   pthread_setname_np (p_name);
+  #else
++  #ifdef __NetBSD__
++  pthread_setname_np (pthread_self (), "%s", p_name);
++  #else
+   pthread_setname_np (pthread_self (), p_name);
++  #endif
+  #endif
+ #endif
+ }


Home | Main Index | Thread Index | Old Index