Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Improve the script to check for installed libraries...



details:   https://anonhg.NetBSD.org/src/rev/8d1145c070c5
branches:  trunk
changeset: 1004893:8d1145c070c5
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 18 16:09:21 2019 +0000

description:
Improve the script to check for installed libraries, and fix the wrong
names and obsolete libraries it found.

diffstat:

 share/mk/bsd.README        |  16 +++++-----------
 share/mk/bsd.prog.mk       |  12 +++---------
 share/mk/compare-lib-lists |  27 ++++++++++++++++++++++++---
 3 files changed, 32 insertions(+), 23 deletions(-)

diffs (185 lines):

diff -r b76865e41b61 -r 8d1145c070c5 share/mk/bsd.README
--- a/share/mk/bsd.README       Mon Nov 18 16:05:55 2019 +0000
+++ b/share/mk/bsd.README       Mon Nov 18 16:09:21 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.395 2019/10/31 06:43:19 martin Exp $
+#      $NetBSD: bsd.README,v 1.396 2019/11/18 16:09:21 christos Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -1645,15 +1645,14 @@
                LIBBLUETOOTH?=          ${DESTDIR}/usr/lib/libbluetooth.a
                LIBBSDMALLOC?=          ${DESTDIR}/usr/lib/libbsdmalloc.a
                LIBBZ2?=                ${DESTDIR}/usr/lib/libbz2.a
+               LIBC?=                  ${DESTDIR}/usr/lib/libc.a
                LIBC_PIC?=              ${DESTDIR}/usr/lib/libc_pic.a
-               LIBC?=                  ${DESTDIR}/usr/lib/libc.a
                LIBCOMPAT?=             ${DESTDIR}/usr/lib/libcompat.a
                LIBCOM_ERR?=            ${DESTDIR}/usr/lib/libcom_err.a
                LIBCRYPT?=              ${DESTDIR}/usr/lib/libcrypt.a
                LIBCRYPTO?=             ${DESTDIR}/usr/lib/libcrypto.a
                LIBCURSES?=             ${DESTDIR}/usr/lib/libcurses.a
-               LIBC_PIC?=              ${DESTDIR}/usr/lib/libc_pic.a
-               LIBDBM?=                ${DESTDIR}/usr/lib/libdbm.a
+               LIBCXX?=                ${DESTDIR}/usr/lib/libc++.a
                LIBDES?=                ${DESTDIR}/usr/lib/libdes.a
                LIBDNS?=                ${DESTDIR}/usr/lib/libdns.a
                LIBEDIT?=               ${DESTDIR}/usr/lib/libedit.a
@@ -1665,7 +1664,6 @@
                LIBFETCH?=              ${DESTDIR}/usr/lib/libfetch.a
                LIBFL?=                 ${DESTDIR}/usr/lib/libfl.a
                LIBFORM?=               ${DESTDIR}/usr/lib/libform.a
-               LIBG2C?=                ${DESTDIR}/usr/lib/libg2c.a
                LIBGCC?=                ${DESTDIR}/usr/lib/libgcc.a
                LIBGNUMALLOC?=          ${DESTDIR}/usr/lib/libgnumalloc.a
                LIBGSSAPI?=             ${DESTDIR}/usr/lib/libgssapi.a
@@ -1688,7 +1686,6 @@
                LIBLDAP?=               ${DESTDIR}/usr/lib/libldap.a
                LIBLDAP_R?=             ${DESTDIR}/usr/lib/libldap_r.a
                LIBLUA?=                ${DESTDIR}/usr/lib/liblua.a
-               LIBLUTOK?=              ${DESTDIR}/usr/lib/liblutok.a
                LIBM?=                  ${DESTDIR}/usr/lib/libm.a
                LIBMAGIC?=              ${DESTDIR}/usr/lib/libmagic.a
                LIBMENU?=               ${DESTDIR}/usr/lib/libmenu.a
@@ -1712,28 +1709,25 @@
                LIBRPCSVC?=             ${DESTDIR}/usr/lib/librpcsvc.a
                LIBRT?=                 ${DESTDIR}/usr/lib/librt.a
                LIBRUMP?=               ${DESTDIR}/usr/lib/librump.a
-               LIBRUMPFS_CD966 0FS?=   ${DESTDIR}/usr/lib/librumpfs_cd9660fs.a
+               LIBRUMPFS_CD9660?=      ${DESTDIR}/usr/lib/librumpfs_cd9660.a
                LIBRUMPFS_EFS?=         ${DESTDIR}/usr/lib/librumpfs_efs.a
                LIBRUMPFS_EXT2FS?=      ${DESTDIR}/usr/lib/librumpfs_ext2fs.a
                LIBRUMPFS_FFS?=         ${DESTDIR}/usr/lib/librumpfs_ffs.a
                LIBRUMPFS_HFS?=         ${DESTDIR}/usr/lib/librumpfs_hfs.a
                LIBRUMPFS_LFS?=         ${DESTDIR}/usr/lib/librumpfs_lfs.a
-               LIBRUMPFS_MSDOSFS?=     ${DESTDIR}/usr/lib/librumpfs_msdosfs.a
+               LIBRUMPFS_MSDOS?=       ${DESTDIR}/usr/lib/librumpfs_msdos.a
                LIBRUMPFS_NFS?=         ${DESTDIR}/usr/lib/librumpfs_nfs.a
                LIBRUMPFS_NTFS?=        ${DESTDIR}/usr/lib/librumpfs_ntfs.a
                LIBRUMPFS_SYSPUFFS?=    ${DESTDIR}/usr/lib/librumpfs_syspuffs.a
                LIBRUMPFS_TMPFS?=       ${DESTDIR}/usr/lib/librumpfs_tmpfs.a
                LIBRUMPFS_UDF?=         ${DESTDIR}/usr/lib/librumpfs_udf.a
-               LIBRUMPFS_UFS?=         ${DESTDIR}/usr/lib/librumpfs_ufs.a
                LIBRUMPUSER?=           ${DESTDIR}/usr/lib/librumpuser.a
                LIBSASLC?=              ${DESTDIR}/usr/lib/libsaslc.a
                LIBSKEY?=               ${DESTDIR}/usr/lib/libskey.a
                LIBSL?=                 ${DESTDIR}/usr/lib/libsl.a
                LIBSQLITE3?=            ${DESTDIR}/usr/lib/libsqlite3.a
-               LIBSS?=                 ${DESTDIR}/usr/lib/libss.a
                LIBSSH?=                ${DESTDIR}/usr/lib/libssh.a
                LIBSSL?=                ${DESTDIR}/usr/lib/libssl.a
-               LIBSSP?=                ${DESTDIR}/usr/lib/libssp.a
                LIBSTDCXX?=             ${DESTDIR}/usr/lib/libstdc++.a
                LIBSUPCXX?=             ${DESTDIR}/usr/lib/libsupc++.a
                LIBTERMINFO?=           ${DESTDIR}/usr/lib/libterminfo.a
diff -r b76865e41b61 -r 8d1145c070c5 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Mon Nov 18 16:05:55 2019 +0000
+++ b/share/mk/bsd.prog.mk      Mon Nov 18 16:09:21 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.323 2019/08/27 22:48:54 kamil Exp $
+#      $NetBSD: bsd.prog.mk,v 1.324 2019/11/18 16:09:21 christos Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -123,7 +123,6 @@
        crypto \
        curses \
        cxx \
-       dbm \
        des \
        dns \
        edit \
@@ -135,7 +134,6 @@
        fetch \
        fl \
        form \
-       g2c \
        gcc \
        gnumalloc \
        gssapi \
@@ -158,7 +156,6 @@
        ldap \
        ldap_r \
        lua \
-       lutok \
        m \
        magic \
        menu \
@@ -182,28 +179,25 @@
        rpcsvc \
        rt \
        rump \
-       rumpfs_cd9660fs \
+       rumpfs_cd9660 \
        rumpfs_efs \
        rumpfs_ext2fs \
        rumpfs_ffs \
        rumpfs_hfs \
        rumpfs_lfs \
-       rumpfs_msdosfs \
+       rumpfs_msdos \
        rumpfs_nfs \
        rumpfs_ntfs \
        rumpfs_syspuffs \
        rumpfs_tmpfs \
        rumpfs_udf \
-       rumpfs_ufs \
        rumpuser \
        saslc \
        skey \
        sl \
        sqlite3 \
-       ss \
        ssh \
        ssl \
-       ssp \
        stdc++ \
        supc++ \
        terminfo \
diff -r b76865e41b61 -r 8d1145c070c5 share/mk/compare-lib-lists
--- a/share/mk/compare-lib-lists        Mon Nov 18 16:05:55 2019 +0000
+++ b/share/mk/compare-lib-lists        Mon Nov 18 16:09:21 2019 +0000
@@ -1,15 +1,16 @@
 #!/bin/sh
-# $NetBSD: compare-lib-lists,v 1.1 2019/08/10 12:50:36 christos Exp $
+# $NetBSD: compare-lib-lists,v 1.2 2019/11/18 16:09:21 christos Exp $
 #
-# Q+D script to print the library lists for compariston between whats in the
+# Q+D script to print the library lists for comparison between whats in the
 # bsd.prog.mk file and bsd.README
 
 prog=$(basename "$0")
 
 RD=/tmp/${prog}.rd.$$
 MK=/tmp/${prog}.mk.$$
+IN=/tmp/${prog}.in.$$
 
-trap "rm -f ${MK} ${RD}" 0 1 2 3 15
+trap "rm -f ${MK} ${RD} ${IN}" 0 1 2 3 15
 
 make -f - all << \EOF > ${MK}
 .include <bsd.prog.mk>
@@ -31,3 +32,23 @@
     sed -e 's/.*lib\([a-zA-Z0-9_+\-]*\)\.a$/\1/' > ${RD}
 
 paste ${MK} ${RD}
+
+echo "------"
+echo "Not installed"
+
+cat << \EOF | make -f - xall > ${IN}
+.include <bsd.prog.mk>
+
+xall:
+.for _lib in ${_LIBLIST}
+       @echo ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
+.endfor
+.for _lib in ${_X11LIBLIST}
+       @echo ${DESTDIR}${X11USRLIBDIR}/lib${_lib}.a
+.endfor
+EOF
+for i in ${IN}; do
+       if [ ! -f $i ]; then
+               echo $i
+       fi
+done



Home | Main Index | Thread Index | Old Index