mirror of
https://github.com/Interlisp/maiko.git
synced 2026-03-02 09:46:27 +00:00
Add libbsd to ld library search for all makefile-linux* and makefile-init-linux*. Add libbsd to MAIKO_LIBRARIES (where appropriate) in CMakeLists.txt. This will support building maiko on Ubuntu 22.04 and Debian 12, where strlcat is found only in libbsd. For Ubuntu 24.04 and beyond and Debian 13 and beyond, strlcat is now in glibc (>2.38).
This commit is contained in:
@@ -21,8 +21,8 @@ OPTFLAGS = -O0 -g
|
||||
DEBUGFLAGS =
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ OPTFLAGS = -O0 -g
|
||||
DEBUGFLAGS =
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ OPTFLAGS = -O0 -g
|
||||
DEBUGFLAGS =
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT -D__wsl1__
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ OPTFLAGS = -O0 -g
|
||||
DEBUGFLAGS =
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT -D__wsl1__
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ XFLAGS = -DSDL=2
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -lm -lSDL2
|
||||
LDELDFLAGS =
|
||||
LDFLAGS = -lm -lSDL2 -lbsd
|
||||
LDELDFLAGS = -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@ XFLAGS = -DXWINDOW
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ SDLFLAGS = -DSDL=2
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -lSDL2 -lm
|
||||
LDELDFLAGS =
|
||||
LDFLAGS = -lSDL2 -lm -lbsd
|
||||
LDELDFLAGS = -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@ XFLAGS = -DXWINDOW
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ XFLAGS = -DSDL=2
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -lm -lSDL2
|
||||
LDELDFLAGS =
|
||||
LDFLAGS = -lm -lSDL2 -lbsd
|
||||
LDELDFLAGS = -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@ XFLAGS = -DXWINDOW
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ XFLAGS = -DSDL=2
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -lm -lSDL2
|
||||
LDELDFLAGS =
|
||||
LDFLAGS = -lm -lSDL2 -lbsd
|
||||
LDELDFLAGS = -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@ XFLAGS = -DXWINDOW
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ SDLFLAGS = -DSDL=2
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
|
||||
|
||||
LDFLAGS = -lSDL2 -lm
|
||||
LDELDFLAGS =
|
||||
LDFLAGS = -lSDL2 -lm -lbsd
|
||||
LDELDFLAGS = -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@ XFLAGS = -DXWINDOW
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ XFLAGS = -DSDL=2
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
|
||||
|
||||
LDFLAGS = -lm -lSDL2
|
||||
LDELDFLAGS =
|
||||
LDFLAGS = -lm -lSDL2 -lbsd
|
||||
LDELDFLAGS = -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@ XFLAGS = -DXWINDOW
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user