Attachment 189682 Details for Bug 214551 – patch for static linking with dependencies from ICU

[patch] patch for static linking with dependencies from ICU

cbsd-20180113.diff (text/plain), 2.06 KB, created by Pavel Volkov on 2018-01-13 11:30:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Volkov

Created: 2018-01-13 11:30:38 UTC

Size: 2.06 KB

patch

obsolete

>diff -urNd sysutils/cbsd.orig/files/patch-Makefile sysutils/cbsd/files/patch-Makefile
>--- sysutils/cbsd.orig/files/patch-Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ sysutils/cbsd/files/patch-Makefile	2018-01-13 11:19:22.811793000 +0000
>@@ -0,0 +1,13 @@
>+--- Makefile.orig	2017-12-12 17:55:44 UTC
>++++ Makefile
>+@@ -45,9 +45,7 @@ cbsd:
>+ 	${CC} bin/cbsdssh6.c -o bin/cbsdssh6 -lssh2 -L/usr/local/lib -I/usr/local/include && ${STRIP} bin/cbsdssh6
>+ 	${CC} bin/cfetch.c -o bin/cfetch -lfetch -L/usr/local/lib -I/usr/local/include && ${STRIP} bin/cfetch
>+ 	${CC} sbin/netmask.c -o sbin/netmask && ${STRIP} sbin/netmask
>+-	${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli
>+-	# ICU?
>+-	#${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lpthread -licui18n -licuuc -licudata -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli
>++	${CC} misc/src/sqlcli.c -static `pkg-config sqlite3 --cflags --libs --static` -lm -lc++ -o misc/sqlcli && ${STRIP} misc/sqlcli
>+ 	${CC} misc/src/cbsdlogtail.c -o misc/cbsdlogtail && ${STRIP} misc/cbsdlogtail
>+ 	${CC} misc/src/pwcrypt.c -lcrypt -o misc/pwcrypt && ${STRIP} misc/pwcrypt
>+ 	${CC} misc/src/chk_arp_byip.c -o misc/chk_arp_byip && ${STRIP} misc/chk_arp_byip
>diff -urNd sysutils/cbsd.orig/files/patch-bin_cbsdsh_Makefile sysutils/cbsd/files/patch-bin_cbsdsh_Makefile
>--- sysutils/cbsd.orig/files/patch-bin_cbsdsh_Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ sysutils/cbsd/files/patch-bin_cbsdsh_Makefile	2018-01-13 11:19:40.106426000 +0000
>@@ -0,0 +1,11 @@
>+--- bin/cbsdsh/Makefile.orig	2018-01-13 11:07:12 UTC
>++++ bin/cbsdsh/Makefile
>+@@ -20,7 +20,7 @@ WITHOUT_MAN=	yes
>+ NOMAN=		yes
>+ 
>+ DPADD= ${LIBEDIT} ${LIBTERMCAP}
>+-LDADD= -ledit -ltermcap -lsqlite3 -lm -pthread -ljail
>++LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs --static` -lm -lc++
>+ 
>+ #CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/lib -L/usr/local/lib
>+ CFLAGS+=-DSHELL -static -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/local/lib

Actions: View | Diff

Attachments on bug 214551: 177075 | 189682