Date: Sat, 29 Aug 2020 06:57:02 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546874 - head/security/fprintd/files Message-ID: <202008290657.07T6v2nH099788@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Aug 29 06:57:02 2020 New Revision: 546874 URL: https://svnweb.freebsd.org/changeset/ports/546874 Log: security/fprintd: fix build on recent current. Obtained from: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/0c6bab8640b3586ac8e1b8c35d87aa49b79719d0.patch Added: head/security/fprintd/files/ head/security/fprintd/files/patch-git_06bab8 (contents, props changed) Added: head/security/fprintd/files/patch-git_06bab8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/fprintd/files/patch-git_06bab8 Sat Aug 29 06:57:02 2020 (r546874) @@ -0,0 +1,46 @@ +Obtained from: + https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/0c6bab8640b3586ac8e1b8c35d87aa49b79719d0.patch + +From 0c6bab8640b3586ac8e1b8c35d87aa49b79719d0 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Thu, 23 Jan 2020 17:37:33 +0100 +Subject: [PATCH] main: Fix redeclaration linking error + +Fix linking error as the "store" global variable gets redeclared in +each C file that includes the header. Move the actual declaration to +main.c. + +Fixes: + /usr/bin/ld: ./.libs/libfprintd.a(device.o):/builds/libfprint/fprintd/src/storage.h:51: multiple definition of `store'; main.o:/builds/libfprint/fprintd/src/storage.h:51: first defined here +--- + src/main.c | 2 ++ + src/storage.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/main.c b/src/main.c +index 8f7e19c..ce1a47d 100644 +--- src/main.c ++++ src/main.c +@@ -33,6 +33,8 @@ + #include "storage.h" + #include "file_storage.h" + ++fp_storage store; ++ + extern DBusGConnection *fprintd_dbus_conn; + static gboolean no_timeout = FALSE; + static gboolean g_fatal_warnings = FALSE; +diff --git a/src/storage.h b/src/storage.h +index d908c59..28ed2b6 100644 +--- src/storage.h ++++ src/storage.h +@@ -46,4 +46,4 @@ struct storage { + typedef struct storage fp_storage; + + /* The currently setup store */ +-fp_storage store; ++extern fp_storage store; +-- +GitLab + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008290657.07T6v2nH099788>