Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Aug 2020 07:29:02 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r545742 - head/devel/opencvs/files
Message-ID:  <202008220729.07M7T2sT035374@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sat Aug 22 07:29:02 2020
New Revision: 545742
URL: https://svnweb.freebsd.org/changeset/ports/545742

Log:
  Unbreak the build with -fno-common (Clang 11, GCC 10).
  
  Reported by:	pkg-fallout

Added:
  head/devel/opencvs/files/patch-client.c   (contents, props changed)
  head/devel/opencvs/files/patch-tag.c   (contents, props changed)
Modified:
  head/devel/opencvs/files/patch-cvs.c
  head/devel/opencvs/files/patch-cvs.h

Added: head/devel/opencvs/files/patch-client.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/opencvs/files/patch-client.c	Sat Aug 22 07:29:02 2020	(r545742)
@@ -0,0 +1,11 @@
+--- client.c.orig	2016-02-06 22:25:25 UTC
++++ client.c
+@@ -33,6 +33,8 @@
+ #include "cvs.h"
+ #include "remote.h"
+ 
++extern struct cvs_var_head cvs_variables;
++
+ struct cvs_req cvs_requests[] = {
+ 	/* this is what our client will use, the server should support it */
+ 	{ "Root",		1,	cvs_server_root, REQ_NEEDED },

Modified: head/devel/opencvs/files/patch-cvs.c
==============================================================================
--- head/devel/opencvs/files/patch-cvs.c	Sat Aug 22 06:50:15 2020	(r545741)
+++ head/devel/opencvs/files/patch-cvs.c	Sat Aug 22 07:29:02 2020	(r545742)
@@ -1,6 +1,14 @@
---- cvs.c.orig	2016-02-06 23:39:08.240246000 +0100
-+++ cvs.c	2016-02-06 23:39:10.243855000 +0100
-@@ -187,8 +187,10 @@ main(int argc, char **argv)
+--- cvs.c.orig	2016-02-06 22:25:25 UTC
++++ cvs.c
+@@ -83,6 +83,7 @@ extern CVSENTRIES *current_list;
+ 
+ struct hash_table created_directories;
+ struct hash_table created_cvs_directories;
++struct cvs_var_head cvs_variables;
+ 
+ void
+ sighandler(int sig)
+@@ -187,8 +188,10 @@ main(int argc, char **argv)
  	struct stat st;
  	char fpath[PATH_MAX];
  

Modified: head/devel/opencvs/files/patch-cvs.h
==============================================================================
--- head/devel/opencvs/files/patch-cvs.h	Sat Aug 22 06:50:15 2020	(r545741)
+++ head/devel/opencvs/files/patch-cvs.h	Sat Aug 22 07:29:02 2020	(r545742)
@@ -1,5 +1,5 @@
---- cvs.h.orig	2015-05-04 11:15:45.000000000 +0200
-+++ cvs.h	2016-02-06 23:33:35.522379000 +0100
+--- cvs.h.orig	2015-05-04 09:15:45 UTC
++++ cvs.h
 @@ -29,6 +29,10 @@
  
  #include <signal.h>
@@ -11,3 +11,12 @@
  #include "config.h"
  #include "file.h"
  #include "log.h"
+@@ -189,7 +193,7 @@ struct cvs_var {
+ 	TAILQ_ENTRY(cvs_var) cv_link;
+ };
+ 
+-TAILQ_HEAD(, cvs_var) cvs_variables;
++TAILQ_HEAD(cvs_var_head, cvs_var);
+ 
+ #define CVS_ROOT_CONNECTED	0x01
+ 

Added: head/devel/opencvs/files/patch-tag.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/opencvs/files/patch-tag.c	Sat Aug 22 07:29:02 2020	(r545742)
@@ -0,0 +1,11 @@
+--- tag.c.orig	2016-02-06 22:25:26 UTC
++++ tag.c
+@@ -34,7 +34,7 @@ void	cvs_tag_local(struct cvs_file *);
+ static int tag_del(struct cvs_file *);
+ static int tag_add(struct cvs_file *);
+ 
+-struct file_info_list	files_info;
++extern struct file_info_list	files_info;
+ 
+ static int	 runflags = 0;
+ static char	*tag = NULL;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008220729.07M7T2sT035374>