svn commit: r513649 - branches/2019Q4/ports-mgmt/pkg/files

Antoine Brodin antoine at FreeBSD.org
Thu Oct 3 06:10:37 UTC 2019


Author: antoine
Date: Thu Oct  3 06:10:36 2019
New Revision: 513649
URL: https://svnweb.freebsd.org/changeset/ports/513649

Log:
  MFH: r513597
  
  Attempt to fix pkg on mips.
  
  Since recently, libarchive is linked to libzstd, which itself uses threads
  somehow, this make the build of pkg in mips unhappy.
  
  Given libpkg is not threadsafe anyway just drop the __thread
  
  PR:		240822
  Reported by:	tech-lists at zyxst.net and mandree
  Discussed with:	jhb

Added:
  branches/2019Q4/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c
     - copied unchanged from r513597, head/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c
Modified:
Directory Properties:
  branches/2019Q4/   (props changed)

Copied: branches/2019Q4/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c (from r513597, head/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q4/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c	Thu Oct  3 06:10:36 2019	(r513649, copy of r513597, head/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c)
@@ -0,0 +1,11 @@
+--- libpkg/pkg_jobs.c.orig	2019-09-18 07:11:10 UTC
++++ libpkg/pkg_jobs.c
+@@ -74,7 +74,7 @@ struct pkg_jobs_locked {
+ 	int (*locked_pkg_cb)(struct pkg *, void *);
+ 	void *context;
+ };
+-static __thread struct pkg_jobs_locked *pkgs_job_lockedpkg;
++static struct pkg_jobs_locked *pkgs_job_lockedpkg;
+ 
+ #define IS_DELETE(j) ((j)->type == PKG_JOBS_DEINSTALL || (j)->type == PKG_JOBS_AUTOREMOVE)
+ 


More information about the svn-ports-branches mailing list