From owner-svn-ports-all@freebsd.org Sat Aug 22 07:29:03 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 883553B087A; Sat, 22 Aug 2020 07:29:03 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BYVPW353fz4Gn3; Sat, 22 Aug 2020 07:29:03 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D4D712A4F; Sat, 22 Aug 2020 07:29:03 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07M7T3Pp035379; Sat, 22 Aug 2020 07:29:03 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07M7T2sT035374; Sat, 22 Aug 2020 07:29:02 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202008220729.07M7T2sT035374@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 22 Aug 2020 07:29:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545742 - head/devel/opencvs/files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/devel/opencvs/files X-SVN-Commit-Revision: 545742 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Aug 2020 07:29:03 -0000 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 @@ -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;