From nobody Wed Dec 8 04:54:17 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8096A18D311F; Wed, 8 Dec 2021 04:54:17 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J84Zd1mBcz3QGZ; Wed, 8 Dec 2021 04:54:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C4A14FEE; Wed, 8 Dec 2021 04:54:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B84sHvw004693; Wed, 8 Dec 2021 04:54:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B84sHB7004692; Wed, 8 Dec 2021 04:54:17 GMT (envelope-from git) Date: Wed, 8 Dec 2021 04:54:17 GMT Message-Id: <202112080454.1B84sHB7004692@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 975c082fd1c4 - main - math/gkmap: fix build with -fno-common List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 975c082fd1c451a3ad276e398df7eb4c60698b02 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638939257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEMEP91VjSUmeiryANN4FVYZkym75UAIRhDlr5d+pBk=; b=bwGhp5G57vc673LZIOLsqhzZF2HuS8SL5wB7gRSI66DbkeY9Kfi0CVWUxWwARA0LieXRIx aqB/SJkzFiNbN4dJl1F2hbi0dO6omlKuVRulRfw1WKE/bLCAOU9UZ2SNvfBl7wCzd39ebL zSvAPc3Xgts7LC4VIg3AjFvcDiZWAwNACnyafmJw9wR7JD3AJK2bRCdO2rcpw6hVgM8FAC uN4TCHK4QWoy3q9hj9ZXxxoIVcw/6vghQfXTfx1K6c1zPT3M1teDACayx6nFk8GTuoePGj v3ikltDX/VBKSF/hoL6hJ5rvxpKIz32cuUw1ImMqdf8T16GMFlHgxAPpWv/mHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638939257; a=rsa-sha256; cv=none; b=NUKTMX1/Akrzc4quRJSkUiLcvEy1hBdnkwFEAAi5dXzE63+GN3UAP2dWbCxIhzP12XwPpR 6MLkbZ4gHD3zAZ6cO1zeWpaupQEPPALwFMYMsEzye0v8t2dVYWBcID/nu0GgnBVka9oful wP4+GEOtgk5RLvb9OqEcfo4/2O66XdhrDZjJXZtgHsvuEzZMM1Vzw1jxnd4Bb8XOtujLI/ XWnXAbz9FcuomZ0bX67p4oLT8fdZK/YNXCGWhIGyp+hKsrBACS1qP78V64jGTFAidwnWyc B9IWhQ+SFi7f6M3nwjIlHUIFbuN/aIBGsGgr7WdRa/+PUChs9+qPpiyfnEQ1vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=975c082fd1c451a3ad276e398df7eb4c60698b02 commit 975c082fd1c451a3ad276e398df7eb4c60698b02 Author: Robert Clausecker AuthorDate: 2021-12-08 04:52:35 +0000 Commit: Hiroki Tagato CommitDate: 2021-12-08 04:54:03 +0000 math/gkmap: fix build with -fno-common PR: 259615 Approved by: javad.kouhi@gmail.com (maintainer timeout, 5 weeks) --- math/gkmap/Makefile | 8 +++----- math/gkmap/files/patch-src_init.c | 14 ++++++++++++++ math/gkmap/files/patch-src_kmap__struct.h | 26 ++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/math/gkmap/Makefile b/math/gkmap/Makefile index f60d57f636ad..3b598de8316e 100644 --- a/math/gkmap/Makefile +++ b/math/gkmap/Makefile @@ -2,7 +2,7 @@ PORTNAME= gkmap PORTVERSION= 0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= SF/gkmap/gkmap/gkmap-${PORTVERSION}/ @@ -11,11 +11,9 @@ COMMENT= Simplification of Boolean Functions using Karnaugh Map LICENSE= GPLv2 -BROKEN_FreeBSD_13= ld: error: duplicate symbol: cell_array -BROKEN_FreeBSD_14= ld: error: duplicate symbol: cell_array - LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz USES= gnome pkgconfig dos2unix USE_GNOME= cairo gdkpixbuf2 gtk20 libglade2 libxml2 diff --git a/math/gkmap/files/patch-src_init.c b/math/gkmap/files/patch-src_init.c new file mode 100644 index 000000000000..03466c7bc4de --- /dev/null +++ b/math/gkmap/files/patch-src_init.c @@ -0,0 +1,14 @@ +--- src/init.c.orig 2021-11-02 09:37:31 UTC ++++ src/init.c +@@ -1,5 +1,11 @@ + #include "kmap_struct.h" + ++/* globals */ ++struct cell cell_array[4][4]; ++struct output out_array[20]; ++char semi_final_out[70]; ++char final_out[100]; ++ + void init_kmap(void) + { + int i,j; diff --git a/math/gkmap/files/patch-src_kmap__struct.h b/math/gkmap/files/patch-src_kmap__struct.h new file mode 100644 index 000000000000..b2b22d1c410f --- /dev/null +++ b/math/gkmap/files/patch-src_kmap__struct.h @@ -0,0 +1,26 @@ +--- src/kmap_struct.h.orig 2021-11-02 09:33:21 UTC ++++ src/kmap_struct.h +@@ -36,7 +36,7 @@ struct cell + struct cell *left,*right,*down,*up; + char col_string[3], row_string[3]; + }; +-struct cell cell_array[4][4]; ++extern struct cell cell_array[4][4]; + + struct output + { +@@ -44,10 +44,10 @@ struct output + char cell_num_string[10]; + int status; + }; +-struct output out_array[20]; +- +-char semi_final_out[70]; +-char final_out[100]; ++extern struct output out_array[20]; ++ ++extern char semi_final_out[70]; ++extern char final_out[100]; + + +