-
Notifications
You must be signed in to change notification settings - Fork 732
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
Alexey Dokuchaev
authored and
Alexey Dokuchaev
committed
Feb 24, 2023
1 parent
a0a2a76
commit 8d492ea
Showing
7 changed files
with
68 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 *~ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 *~ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 *~ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 \ |