Attachment 228928 Details for Bug 259254 – remove use of lorder from converters/iconv

[patch] remove use of lorder from converters/iconv

iconv-lorder.diff (text/plain), 1.66 KB, created by Ed Maste on 2021-10-21 18:21:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Maste

Created: 2021-10-21 18:21:44 UTC

Size: 1.66 KB

patch

obsolete

>commit 74c58a4912c415750d0de559aaf3a86d75409edf
>Author: Ed Maste <emaste@FreeBSD.org>
>Date:   Thu Oct 21 14:17:31 2021 -0400
>
>    converters/iconv: drop use of lorder(1)
>    
>    lorder is obsolete and may be removed from the base system in the
>    future.
>    
>    PR:             259254
>    Sponsored by:   The FreeBSD Foundation
>
>diff --git a/converters/iconv/files/patch-ces__Makefile b/converters/iconv/files/patch-ces__Makefile
>index 5c39a6915660..7f5c8a2961cd 100644
>--- a/converters/iconv/files/patch-ces__Makefile
>+++ b/converters/iconv/files/patch-ces__Makefile
>@@ -1,34 +1,37 @@
> --- ces/Makefile	2002/03/17 11:07:44	1.1
> +++ ces/Makefile	2002/03/17 11:07:56
> @@ -10,7 +10,7 @@
>  LIB=		ces
>  SRCS=		ces_builtin.c ${CHARSETS_C}
>  
> -LDADD =		-L${.CURDIR}/../lib -liconv
> +LDADD =		-L${.CURDIR}/../lib -lbiconv
>  
>  INTERNALLIB =
>  
>-@@ -27,9 +27,9 @@ ces_builtin.c:	${CHARSETS_C} ${CHARSETS_
>+@@ -27,11 +27,11 @@ ces_builtin.c:	${CHARSETS_C} ${CHARSETS_O}
>  		${.CURDIR}/../iconv_builtin -mo ${.TARGET} \
>  			${CHARSETS_C} PIC ${CHARSETS_O}
>  
> -.SUFFIXES:	.so .So
> +.SUFFIXES:	.so .So .pico
>  
> -.So.so:
> +.So.so .pico.so:
>  	@${LDDESTDIRENV} ${CC} -shared -Wl,-x -o ${.TARGET} \
>- 		-Wl,-soname,${.TARGET} `lorder ${.ALLSRC} | tsort -q` \
>+-		-Wl,-soname,${.TARGET} `lorder ${.ALLSRC} | tsort -q` \
>++		-Wl,-soname,${.TARGET} ${.ALLSRC} \
>  		${LDDESTDIR} ${LDADD}
>+ 
>+ beforeinstall:
> @@ -41,8 +41,8 @@ beforeinstall:
>  		${INSTALLFLAGS} ${SHLINSTALLFLAGS} ${CHARSETS_SO} \
>  		${DESTDIR}${MODULEDIR}
>  
> -CLEANFILES +=	*.so *.So ces_builtin.c *.lst
> +CLEANFILES +=	*.so *.So *.pico ces_builtin.c *.lst
>  
>  .include <bsd.lib.mk>
>  
> -.SUFFIXES:	.so .So
> +.SUFFIXES:	.so .So .pico

Actions: View | Diff

Attachments on bug 259254: 228812 | 228928