Module Name: src
Committed By: christos
Date: Tue Dec 17 18:59:39 UTC 2019
Modified Files:
src/external/bsd/file: Makefile.inc
src/external/bsd/file/bin: Makefile
src/external/bsd/file/lib: Makefile
Log Message:
Fix sun2 (static linking)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/bin/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/file/Makefile.inc
diff -u src/external/bsd/file/Makefile.inc:1.6 src/external/bsd/file/Makefile.inc:1.7
--- src/external/bsd/file/Makefile.inc:1.6 Wed Feb 22 07:34:49 2017
+++ src/external/bsd/file/Makefile.inc Tue Dec 17 13:59:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2017/02/22 12:34:49 maya Exp $
+# $NetBSD: Makefile.inc,v 1.7 2019/12/17 18:59:39 christos Exp $
WARNS=4
DIST=${NETBSDSRCDIR}/external/bsd/file/dist
@@ -21,3 +21,8 @@ CPPFLAGS+= -DMAGIC='"${MAGIC}"' -DHAVE_C
CPPFLAGS+= -I${.CURDIR}/../include -I${DIST}/src
.PATH: ${DIST}/src ${DIST}/doc
+
+DPLIBS+= lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib
+DPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
+DPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+
Index: src/external/bsd/file/bin/Makefile
diff -u src/external/bsd/file/bin/Makefile:1.3 src/external/bsd/file/bin/Makefile:1.4
--- src/external/bsd/file/bin/Makefile:1.3 Wed Jan 15 20:15:33 2014
+++ src/external/bsd/file/bin/Makefile Tue Dec 17 13:59:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/01/16 01:15:33 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/12/17 18:59:39 christos Exp $
.include <bsd.own.mk>
@@ -10,8 +10,9 @@ FILES= ${MFILES}
.endif
PROG= file
-LDADD+= -lmagic -lz
-DPADD+= ${LIBMAGIC} ${LIBZ}
+LDADD+= -lmagic
+DPADD+= ${LIBMAGIC}
+PROGDPLIBS += ${DPLIBS}
MAN= file.1 magic.5
CLEANFILES+= magic.mgc
Index: src/external/bsd/file/lib/Makefile
diff -u src/external/bsd/file/lib/Makefile:1.14 src/external/bsd/file/lib/Makefile:1.15
--- src/external/bsd/file/lib/Makefile:1.14 Tue Dec 17 08:35:43 2019
+++ src/external/bsd/file/lib/Makefile Tue Dec 17 13:59:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/12/17 13:35:43 christos Exp $
+# $NetBSD: Makefile,v 1.15 2019/12/17 18:59:39 christos Exp $
#
USE_FORT?= yes # data driven bugs?
@@ -8,9 +8,7 @@ USE_FORT?= yes # data driven bugs?
.include "../Makefile.inc"
LIB= magic
-LIBDPLIBS+= lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib
-LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
-LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+= ${DPLIBS}
CPPFLAGS+=-I.
.if ${MACHINE_ARCH} == "i386"
