mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-14 07:43:06 +00:00
Code Issues Releases Activity

cad/geda: unbreak the port's build (specifically, linking)

Browse Source 
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.
This commit is contained in:
Alexey Dokuchaev 2023-02-24 12:42:08 +00:00
parent a0a2a76790
commit 8d492eab5d
7 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cad/geda/Makefile
View File

@ -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

9
cad/geda/files/patch-configure
View File

@ -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

11
cad/geda/files/patch-gnetlist_src_Makefile.in Normal file
View File

@ -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 *~

11
cad/geda/files/patch-gsymcheck_src_Makefile.in Normal file
View File

@ -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 *~

11
cad/geda/files/patch-libgeda_shell_Makefile.in Normal file
View File

@ -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

11
cad/geda/files/patch-utils_gschlas_Makefile.in Normal file
View File

@ -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 *~

15
cad/geda/files/patch-utils_src_Makefile.in Normal file
View File

@ -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 \