From nobody Fri Feb 24 12:42:32 2023 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 4PNV0T0pB8z3tBrX; Fri, 24 Feb 2023 12:42:33 +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 4PNV0T0DVHz3yk3; Fri, 24 Feb 2023 12:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677242553; 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=GwNYD55RjKivTuZ/6W/ey6bMLJT3bHGdZwLjoG3uvVo=; b=uKYNU1wGpnQfK+k/RfePNprFUKC8HNu6q0K9fp2II/xOPFRAxEdQHFOgfW1r9H4NvAwle5 5f1UH3r4ZOxp4KZTZFMxwcGZAEadp3bhvBmVOfUJlXzEC9FGMQHmejPj8QcbQSI6Wc2uXD E7GgTAdN5o13+1Si3A5jGqrYpaMnEjl7W/kUWpuk8TOTPltc9vzynTLp3RnWb3aNtbSeE3 23GPIra1HMlLDh3A+D7GZ3L2sdtVJrIL7AwiAAYbpNwGIXH+C+cUr8Q5NLUoYgsdPFJISM 5q9j7eelqW3x6S2gLhlBZcj9cjHi6crS64G72jYMLBB8HzIZfzGLpIlfbHK/Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677242553; 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=GwNYD55RjKivTuZ/6W/ey6bMLJT3bHGdZwLjoG3uvVo=; b=NsXI3GRC2lYf/Vze8qOCpuVdsCtkTGmDkrkC420PlpiL4HEGUpBgq/pu88NroAz3WbfbUA csNjbjs9PVaz+pCllLnUgOtfwceZVYdkyk8YOKHcY2x5nHsvNoxspihVjs5n/PAPgaa6bV NQuOyG7IBAX/4quvZoVUxzimMd5vDsSF9J0iSye20hpNofJiUeZBMlETCQelf9nUUtJbmE 1254uUMuBn6EJUO8YsRfTS+EMVAiv24XqjwsTlFRtRjbZIQ6kJilIDnfteUjy55Or5gqtB sNmxm1f7z6WgVh1qwGQc2wfdlxRckcaUeaNKgbh3zF/3hl4hBE7tlqvbmLudOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677242553; a=rsa-sha256; cv=none; b=cIdeHNxdCf6x8bQxMRau89Yl3Bk9Y3mh49dSEQ/OKq4bBq5bhFSDIbJ9VWaMCwV/m7vB38 0i77OKe4IIXhVgACkUWaqawq235O8uwL/9Nc1GvlwP2DPJzqg3Aj6UhNeao8VW33Vzh0Gx 9LLLSVI4JAIFQPjkcy83VrVV1lcyMTNO4n0LRNGwFOjAKpkGaxXWRNW0QgbqVG6AYrHFlB ZdH3bBJYa1FzMvWuNKFpB26Sd/jLcZ4QPLBUx7IYsUwWavfxfN6Vo7+IcyXc7JOM6ocZll XDEZS2l2ySZMB9qAwxKa8kNfrrUknffrQAOAKOIJ5TdvA6nFnqY/Ut1aEwzYDQ== 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 4PNV0S6QtRzPD1; Fri, 24 Feb 2023 12:42:32 +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 31OCgWTY091520; Fri, 24 Feb 2023 12:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31OCgW7g091519; Fri, 24 Feb 2023 12:42:32 GMT (envelope-from git) Date: Fri, 24 Feb 2023 12:42:32 GMT Message-Id: <202302241242.31OCgW7g091519@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 8d492eab5d88 - main - cad/geda: unbreak the port's build (specifically, linking) 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d492eab5d8853684beb1145396a8f469d719dab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d492eab5d8853684beb1145396a8f469d719dab commit 8d492eab5d8853684beb1145396a8f469d719dab Author: Alexey Dokuchaev AuthorDate: 2023-02-24 12:42:08 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-02-24 12:42:08 +0000 cad/geda: unbreak the port's build (specifically, linking) Add missing -lgio-2.0 to several LDFLAGS which require it. While here, fix the configure script to respect the passed --with-libstroke=${LOCALBASE} correctly. --- cad/geda/Makefile | 8 -------- cad/geda/files/patch-configure | 9 +++++++++ cad/geda/files/patch-gnetlist_src_Makefile.in | 11 +++++++++++ cad/geda/files/patch-gsymcheck_src_Makefile.in | 11 +++++++++++ cad/geda/files/patch-libgeda_shell_Makefile.in | 11 +++++++++++ cad/geda/files/patch-utils_gschlas_Makefile.in | 11 +++++++++++ cad/geda/files/patch-utils_src_Makefile.in | 15 +++++++++++++++ 7 files changed, 68 insertions(+), 8 deletions(-) diff --git a/cad/geda/Makefile b/cad/geda/Makefile index 5280ef26d6e4..73f9c68174e2 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -12,12 +12,6 @@ WWW= http://www.gpleda.org/ LICENSE= GPLv2+ -.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld -BROKEN= ld: error: ../src/.libs/libgeda.so: undefined reference to g_input_stream_get_type -.endif -DEPRECATED= Broken with lld -EXPIRATION_DATE= 2023-03-20 - LIB_DEPENDS= libstroke.so:devel/libstroke \ libguile.so:lang/guile1 RUN_DEPENDS= gawk:lang/gawk\ @@ -35,8 +29,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libstroke=${LOCALBASE} INSTALL_TARGET= install-strip USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-gaf DATADIR= ${PREFIX}/share/gEDA INFO= geda-scheme diff --git a/cad/geda/files/patch-configure b/cad/geda/files/patch-configure index 6b0d73778f53..92a9ead263c7 100644 --- a/cad/geda/files/patch-configure +++ b/cad/geda/files/patch-configure @@ -9,3 +9,12 @@ case "$host" in *-*-linux*) OS_LINUX=yes +@@ -20127,7 +20127,7 @@ fi + + # If a prefix to search was specified, then add the appropriate + # flags. +- if test "X$libstroke_use" = "X"; then ++ if test -n "$libstroke_prefix"; then + LIBSTROKE_LDFLAGS="-L$libstroke_prefix/lib" + LIBSTROKE_CFLAGS="-I$libstroke_prefix/include" + fi diff --git a/cad/geda/files/patch-gnetlist_src_Makefile.in b/cad/geda/files/patch-gnetlist_src_Makefile.in new file mode 100644 index 000000000000..825787a1726f --- /dev/null +++ b/cad/geda/files/patch-gnetlist_src_Makefile.in @@ -0,0 +1,11 @@ +--- gnetlist/src/Makefile.in.orig 2013-09-25 21:55:31 UTC ++++ gnetlist/src/Makefile.in +@@ -439,7 +439,7 @@ gnetlist_CPPFLAGS = -I$(top_srcdir)/libgeda/include -I + gnetlist_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLIGS) $(GLIB_CFLAGS) \ + $(GUILE_CFLAGS) $(GDK_PIXBUF_CFLAGS) + +-gnetlist_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) ++gnetlist_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) + gnetlist_LDADD = $(top_builddir)/libgeda/src/libgeda.la + MOSTLYCLEANFILES = *.log *.ps core FILE *~ + CLEANFILES = *.log *.ps core FILE *~ diff --git a/cad/geda/files/patch-gsymcheck_src_Makefile.in b/cad/geda/files/patch-gsymcheck_src_Makefile.in new file mode 100644 index 000000000000..57aa7cfe4505 --- /dev/null +++ b/cad/geda/files/patch-gsymcheck_src_Makefile.in @@ -0,0 +1,11 @@ +--- gsymcheck/src/Makefile.in.orig 2013-09-25 21:55:33 UTC ++++ gsymcheck/src/Makefile.in +@@ -428,7 +428,7 @@ gsymcheck_CPPFLAGS = -I$(top_srcdir)/libgeda/include - + gsymcheck_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLIGS) $(GLIB_CFLAGS) \ + $(GUILE_CFLAGS) $(GDK_PIXBUF_CFLAGS) + +-gsymcheck_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) ++gsymcheck_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) + gsymcheck_LDADD = $(top_builddir)/libgeda/src/libgeda.la + MOSTLYCLEANFILES = *.log *.ps core FILE *~ + CLEANFILES = *.log *.ps core FILE *~ diff --git a/cad/geda/files/patch-libgeda_shell_Makefile.in b/cad/geda/files/patch-libgeda_shell_Makefile.in new file mode 100644 index 000000000000..e7d44fa9b997 --- /dev/null +++ b/cad/geda/files/patch-libgeda_shell_Makefile.in @@ -0,0 +1,11 @@ +--- libgeda/shell/Makefile.in.orig 2013-09-25 21:55:33 UTC ++++ libgeda/shell/Makefile.in +@@ -416,7 +416,7 @@ geda_shell_CFLAGS = \ + $(GCC_CFLAGS) $(MINGW_CFLAGS) $(GUILE_CFLAGS) $(GLIB_CFLAGS) \ + $(GDK_PIXBUF_CFLAGS) + +-geda_shell_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) ++geda_shell_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) + geda_shell_LDADD = ../src/libgeda.la @LIBINTL@ + + # This is used to generate boilerplate for defining Scheme functions diff --git a/cad/geda/files/patch-utils_gschlas_Makefile.in b/cad/geda/files/patch-utils_gschlas_Makefile.in new file mode 100644 index 000000000000..347b23be5906 --- /dev/null +++ b/cad/geda/files/patch-utils_gschlas_Makefile.in @@ -0,0 +1,11 @@ +--- utils/gschlas/Makefile.in.orig 2013-09-25 21:55:34 UTC ++++ utils/gschlas/Makefile.in +@@ -425,7 +425,7 @@ gschlas_CPPFLAGS = -I$(top_srcdir)/libgeda/include -I$ + gschlas_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLIGS) $(GLIB_CFLAGS) \ + $(GUILE_CFLAGS) $(GDK_PIXBUF_CFLAGS) + +-gschlas_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) ++gschlas_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) + gschlas_LDADD = $(top_builddir)/libgeda/src/libgeda.la + MOSTLYCLEANFILES = *.log *.ps core FILE *~ + CLEANFILES = *.log *.ps core FILE *~ diff --git a/cad/geda/files/patch-utils_src_Makefile.in b/cad/geda/files/patch-utils_src_Makefile.in new file mode 100644 index 000000000000..362cfc6a9708 --- /dev/null +++ b/cad/geda/files/patch-utils_src_Makefile.in @@ -0,0 +1,15 @@ +--- utils/src/Makefile.in.orig 2013-09-25 21:55:34 UTC ++++ utils/src/Makefile.in +@@ -462,10 +462,10 @@ gsch2pcb_CPPFLAGS = \ + -DPCBLIBPATH=\"$(PCBLIBPATH)\" + + gsch2pcb_CFLAGS = $(GLIB_CFLAGS) +-gsch2pcb_LDFLAGS = $(GLIB_LIBS) ++gsch2pcb_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 + sarlacc_schem_SOURCES = sarlacc_schem.c + sarlacc_schem_CFLAGS = $(GLIB_CFLAGS) $(GUILE_CFLAGS) $(GDK_PIXBUF_CFLAGS) +-sarlacc_schem_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) ++sarlacc_schem_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) + sarlacc_schem_LDADD = $(top_builddir)/libgeda/src/libgeda.la + AM_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLIGS) + AM_CPPFLAGS = -I$(top_srcdir)/libgeda/include -I$(srcdir)/../include \