Module Name: src
Committed By: riastradh
Date: Wed Jul 5 22:42:48 UTC 2023
Modified Files:
src/distrib/sets/lists/debug: mi shl.mi
src/tests/libexec/ld.elf_so/helper_abuse_dynamic: Makefile
src/tests/libexec/ld.elf_so/helper_abuse_static: Makefile
src/tests/libexec/ld.elf_so/helper_def_dynamic: Makefile
src/tests/libexec/ld.elf_so/helper_def_static: Makefile
src/tests/libexec/ld.elf_so/helper_dso1: Makefile
src/tests/libexec/ld.elf_so/helper_dso2: Makefile
src/tests/libexec/ld.elf_so/helper_dso3: Makefile
src/tests/libexec/ld.elf_so/helper_ifunc_dso: Makefile
src/tests/libexec/ld.elf_so/helper_onlyctor_dynamic: Makefile
src/tests/libexec/ld.elf_so/helper_onlydef: Makefile
src/tests/libexec/ld.elf_so/helper_onlydef_static: Makefile
src/tests/libexec/ld.elf_so/helper_onlyuse_dynamic: Makefile
src/tests/libexec/ld.elf_so/helper_onlyuse_static: Makefile
src/tests/libexec/ld.elf_so/helper_symver_dso0: Makefile
src/tests/libexec/ld.elf_so/helper_symver_dso1: Makefile
src/tests/libexec/ld.elf_so/helper_symver_dso2: Makefile
src/tests/libexec/ld.elf_so/helper_use_dynamic: Makefile
src/tests/libexec/ld.elf_so/helper_use_static: Makefile
Added Files:
src/tests/libexec/ld.elf_so: helper.mk
Log Message:
tests/libexec/ld.elf_so: Fix helper library makefiles.
1. Consolidate logic into a single helper.mk to reduce duplication.
2. Set NO* variables, not MK* variables which are reserved for user.
3. Avoid eager X!= in favour of lazy ${X:sh}.
4. Mark _g.a set list entries obsolete. Never should've been built!
PR misc/57462
To generate a diff of this commit:
cvs rdiff -u -r1.405 -r1.406 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.313 -r1.314 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r0 -r1.1 src/tests/libexec/ld.elf_so/helper.mk
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_abuse_dynamic/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_abuse_static/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_def_dynamic/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_def_static/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/libexec/ld.elf_so/helper_dso1/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/libexec/ld.elf_so/helper_dso2/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/libexec/ld.elf_so/helper_dso3/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_ifunc_dso/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_onlyctor_dynamic/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/libexec/ld.elf_so/helper_onlydef/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_onlydef_static/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_onlyuse_dynamic/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_onlyuse_static/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_symver_dso0/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_use_dynamic/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/tests/libexec/ld.elf_so/helper_use_static/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.405 src/distrib/sets/lists/debug/mi:1.406
--- src/distrib/sets/lists/debug/mi:1.405 Wed Jun 21 02:48:49 2023
+++ src/distrib/sets/lists/debug/mi Wed Jul 5 22:42:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.405 2023/06/21 02:48:49 pgoyette Exp $
+# $NetBSD: mi,v 1.406 2023/07/05 22:42:46 riastradh Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -2532,14 +2532,14 @@
./usr/libdata/debug/usr/tests/util/id/h_id.debug tests-obsolete obsolete,compattestfile
./usr/libdata/debug/usr/tests/util/systrace/h_have_systrace.debug tests-obsolete obsolete,compattestfile
./usr/tests/lib/libc/tls/libh_tls_dynamic_g.a comp-c-debuglib atf,debuglib,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_abuse_dynamic_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_abuse_static_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_def_dynamic_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_def_static_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_onlyctor_dynamic_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_onlydef_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_onlyuse_dynamic_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_onlyuse_static_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_use_dynamic_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_use_static_g.a tests-libexec-debug debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_abuse_dynamic_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_abuse_static_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_def_dynamic_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_def_static_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_onlyctor_dynamic_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_onlydef_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_onlyuse_dynamic_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_onlyuse_static_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_use_dynamic_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
+./usr/tests/libexec/ld.elf_so/libh_use_static_g.a tests-obsolete obsolete,debuglib,atf,pic,compattestfile
./var/db/obsolete/debug base-sys-root debug
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.313 src/distrib/sets/lists/debug/shl.mi:1.314
--- src/distrib/sets/lists/debug/shl.mi:1.313 Tue Jul 4 16:22:10 2023
+++ src/distrib/sets/lists/debug/shl.mi Wed Jul 5 22:42:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.313 2023/07/04 16:22:10 riastradh Exp $
+# $NetBSD: shl.mi,v 1.314 2023/07/05 22:42:46 riastradh Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
@@ -377,10 +377,10 @@
./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_onlyuse_static.so.1.debug tests-libexec-debug debug,compattestfile,atf
./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_use_dynamic.so.1.debug tests-libexec-debug debug,compattestfile,atf
./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_use_static.so.1.debug tests-libexec-debug debug,compattestfile,atf
-./usr/tests/libexec/ld.elf_so/h_helper_symver_dso0/libh_helper_symver_dso_g.a comp-c-debuglib atf,debuglib,compattestfile
-./usr/tests/libexec/ld.elf_so/h_helper_symver_dso1/libh_helper_symver_dso_g.a comp-c-debuglib atf,debuglib,compattestfile
-./usr/tests/libexec/ld.elf_so/h_helper_symver_dso2/libh_helper_symver_dso_g.a comp-c-debuglib atf,debuglib,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_helper_dso1_g.a comp-c-debuglib atf,debuglib,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_helper_dso2_g.a comp-c-debuglib atf,debuglib,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_helper_dso3_g.a comp-c-debuglib atf,debuglib,compattestfile
-./usr/tests/libexec/ld.elf_so/libh_helper_ifunc_dso_g.a comp-c-debuglib atf,debuglib,compattestfile
+./usr/tests/libexec/ld.elf_so/h_helper_symver_dso0/libh_helper_symver_dso_g.a comp-obsolete atf,debuglib,compattestfile,obsolete
+./usr/tests/libexec/ld.elf_so/h_helper_symver_dso1/libh_helper_symver_dso_g.a comp-obsolete atf,debuglib,compattestfile,obsolete
+./usr/tests/libexec/ld.elf_so/h_helper_symver_dso2/libh_helper_symver_dso_g.a comp-obsolete atf,debuglib,compattestfile,obsolete
+./usr/tests/libexec/ld.elf_so/libh_helper_dso1_g.a comp-obsolete atf,debuglib,compattestfile,obsolete
+./usr/tests/libexec/ld.elf_so/libh_helper_dso2_g.a comp-obsolete atf,debuglib,compattestfile,obsolete
+./usr/tests/libexec/ld.elf_so/libh_helper_dso3_g.a comp-obsolete atf,debuglib,compattestfile,obsolete
+./usr/tests/libexec/ld.elf_so/libh_helper_ifunc_dso_g.a comp-obsolete atf,debuglib,compattestfile,obsolete
Index: src/tests/libexec/ld.elf_so/helper_abuse_dynamic/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_abuse_dynamic/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_abuse_dynamic/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_abuse_dynamic/Makefile:1.1 Thu Jun 1 22:26:40 2023
+++ src/tests/libexec/ld.elf_so/helper_abuse_dynamic/Makefile Wed Jul 5 22:42:46 2023
@@ -1,22 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2023/06/01 22:26:40 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:46 riastradh Exp $
LIB= h_abuse_dynamic
SRCS= h_abuse_dynamic.c
-DEF_DIR!= cd ${.CURDIR}/../helper_def_dynamic && ${PRINTOBJDIR}
+DEF_DIR_cmd= cd ${.CURDIR}/../helper_def_dynamic && ${PRINTOBJDIR}
+DEF_DIR= ${DEF_DIR_cmd:sh}
LDADD+= -Wl,-rpath,${TESTSDIR} -L${DEF_DIR} -lh_def_dynamic
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_abuse_static/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_abuse_static/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_abuse_static/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_abuse_static/Makefile:1.1 Thu Jun 1 22:26:40 2023
+++ src/tests/libexec/ld.elf_so/helper_abuse_static/Makefile Wed Jul 5 22:42:46 2023
@@ -1,22 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2023/06/01 22:26:40 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:46 riastradh Exp $
LIB= h_abuse_static
SRCS= h_abuse_static.c
-DEF_DIR!= cd ${.CURDIR}/../helper_def_static && ${PRINTOBJDIR}
+DEF_DIR_cmd= cd ${.CURDIR}/../helper_def_static && ${PRINTOBJDIR}
+DEF_DIR= ${DEF_DIR_cmd:sh}
LDADD+= -Wl,-rpath,${TESTSDIR} -L${DEF_DIR} -lh_def_static
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_def_dynamic/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_def_dynamic/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_def_dynamic/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_def_dynamic/Makefile:1.1 Thu Jun 1 20:50:18 2023
+++ src/tests/libexec/ld.elf_so/helper_def_dynamic/Makefile Wed Jul 5 22:42:46 2023
@@ -1,19 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2023/06/01 20:50:18 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:46 riastradh Exp $
LIB= h_def_dynamic
SRCS= h_def_dynamic.c
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_def_static/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_def_static/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_def_static/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_def_static/Makefile:1.1 Wed May 31 00:18:44 2023
+++ src/tests/libexec/ld.elf_so/helper_def_static/Makefile Wed Jul 5 22:42:46 2023
@@ -1,19 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2023/05/31 00:18:44 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:46 riastradh Exp $
LIB= h_def_static
SRCS= h_def_static.c
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_dso1/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_dso1/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_dso1/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_dso1/Makefile:1.1 Thu Mar 31 23:34:48 2011
+++ src/tests/libexec/ld.elf_so/helper_dso1/Makefile Wed Jul 5 22:42:46 2023
@@ -1,19 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2011/03/31 23:34:48 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:46 riastradh Exp $
-.include <bsd.own.mk>
+LIB= h_helper_dso1
+SRCS= h_helper_dso1.c
-LIB= h_helper_dso1
-SRCS= h_helper_dso1.c
-
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_dso2/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_dso2/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_dso2/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_dso2/Makefile:1.1 Thu Mar 31 23:34:48 2011
+++ src/tests/libexec/ld.elf_so/helper_dso2/Makefile Wed Jul 5 22:42:47 2023
@@ -1,22 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2011/03/31 23:34:48 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:47 riastradh Exp $
-.include <bsd.own.mk>
+LIB= h_helper_dso2
+SRCS= h_helper_dso2.c
-LIB= h_helper_dso2
-SRCS= h_helper_dso2.c
-
-DSO1DIR!= cd ${.CURDIR}/../helper_dso1 && ${PRINTOBJDIR}
+DSO1DIR_cmd= cd ${.CURDIR}/../helper_dso1 && ${PRINTOBJDIR}
+DSO1DIR= ${DSO1DIR_cmd:sh}
LDADD+= -Wl,-rpath,${TESTSDIR} -L${DSO1DIR} -lh_helper_dso1
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_dso3/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_dso3/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_dso3/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_dso3/Makefile:1.1 Tue Jul 11 15:21:36 2017
+++ src/tests/libexec/ld.elf_so/helper_dso3/Makefile Wed Jul 5 22:42:47 2023
@@ -1,22 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2017/07/11 15:21:36 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:47 riastradh Exp $
-.include <bsd.own.mk>
-
-LIB= h_helper_dso3
+LIB= h_helper_dso3
LIBISCXX= yes
-SRCS= h_helper_dso3.cpp
-
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
+SRCS= h_helper_dso3.cpp
CXXFLAGS+= -std=c++11
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_ifunc_dso/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_ifunc_dso/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_ifunc_dso/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_ifunc_dso/Makefile:1.1 Mon Aug 25 20:40:53 2014
+++ src/tests/libexec/ld.elf_so/helper_ifunc_dso/Makefile Wed Jul 5 22:42:47 2023
@@ -1,19 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2014/08/25 20:40:53 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:47 riastradh Exp $
-.include <bsd.own.mk>
+LIB= h_helper_ifunc_dso
+SRCS= h_helper_ifunc.c
-LIB= h_helper_ifunc_dso
-SRCS= h_helper_ifunc.c
-
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_onlyctor_dynamic/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_onlyctor_dynamic/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_onlyctor_dynamic/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_onlyctor_dynamic/Makefile:1.1 Fri Jun 2 19:09:11 2023
+++ src/tests/libexec/ld.elf_so/helper_onlyctor_dynamic/Makefile Wed Jul 5 22:42:47 2023
@@ -1,22 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2023/06/02 19:09:11 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:47 riastradh Exp $
LIB= h_onlyctor_dynamic
SRCS= h_onlyctor_dynamic.c
-DEF_DIR!= cd ${.CURDIR}/../helper_onlydef && ${PRINTOBJDIR}
+DEF_DIR_cmd= cd ${.CURDIR}/../helper_onlydef && ${PRINTOBJDIR}
+DEF_DIR= ${DEF_DIR_cmd:sh}
LDADD+= -Wl,-rpath,${TESTSDIR} -L${DEF_DIR} -lh_onlydef
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_onlydef/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_onlydef/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_onlydef/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_onlydef/Makefile:1.1 Fri Jun 2 19:08:49 2023
+++ src/tests/libexec/ld.elf_so/helper_onlydef/Makefile Wed Jul 5 22:42:47 2023
@@ -1,19 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2023/06/02 19:08:49 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:47 riastradh Exp $
LIB= h_onlydef
SRCS= h_onlydef.c
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_onlydef_static/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_onlydef_static/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_onlydef_static/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_onlydef_static/Makefile:1.1 Fri Jun 2 19:08:49 2023
+++ src/tests/libexec/ld.elf_so/helper_onlydef_static/Makefile Wed Jul 5 22:42:47 2023
@@ -1,19 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2023/06/02 19:08:49 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:47 riastradh Exp $
LIB= h_onlydef_static
SRCS= h_onlydef_static.c
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_onlyuse_dynamic/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_onlyuse_dynamic/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_onlyuse_dynamic/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_onlyuse_dynamic/Makefile:1.1 Fri Jun 2 19:08:49 2023
+++ src/tests/libexec/ld.elf_so/helper_onlyuse_dynamic/Makefile Wed Jul 5 22:42:47 2023
@@ -1,22 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2023/06/02 19:08:49 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:47 riastradh Exp $
LIB= h_onlyuse_dynamic
SRCS= h_onlyuse_dynamic.c
-DEF_DIR!= cd ${.CURDIR}/../helper_onlydef && ${PRINTOBJDIR}
+DEF_DIR_cmd= cd ${.CURDIR}/../helper_onlydef && ${PRINTOBJDIR}
+DEF_DIR= ${DEF_DIR_cmd:sh}
LDADD+= -Wl,-rpath,${TESTSDIR} -L${DEF_DIR} -lh_onlydef
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_onlyuse_static/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_onlyuse_static/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_onlyuse_static/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_onlyuse_static/Makefile:1.1 Fri Jun 2 19:08:49 2023
+++ src/tests/libexec/ld.elf_so/helper_onlyuse_static/Makefile Wed Jul 5 22:42:47 2023
@@ -1,22 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2023/06/02 19:08:49 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:47 riastradh Exp $
LIB= h_onlyuse_static
SRCS= h_onlyuse_static.c
-DEF_DIR!= cd ${.CURDIR}/../helper_onlydef && ${PRINTOBJDIR}
+DEF_DIR_cmd= cd ${.CURDIR}/../helper_onlydef && ${PRINTOBJDIR}
+DEF_DIR= ${DEF_DIR_cmd:sh}
LDADD+= -Wl,-rpath,${TESTSDIR} -L${DEF_DIR} -lh_onlydef
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_symver_dso0/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_symver_dso0/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_symver_dso0/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_symver_dso0/Makefile:1.1 Sat Jun 25 05:45:13 2011
+++ src/tests/libexec/ld.elf_so/helper_symver_dso0/Makefile Wed Jul 5 22:42:47 2023
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/25 05:45:13 nonaka Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:47 riastradh Exp $
LIB= h_helper_symver_dso
SRCS= h_helper_symver_dso0.c
@@ -9,13 +7,6 @@ LIBDIR= ${TESTSBASE}/libexec/ld.elf_so/
SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so/h_helper_symver_dso0
SHLIB_MAJOR= 1
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
FILESDIR= ${TESTSBASE}/libexec/ld.elf_so/h_helper_symver_dso0
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile:1.3 src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile:1.4
--- src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile:1.3 Fri Feb 14 20:33:32 2014
+++ src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile Wed Jul 5 22:42:48 2023
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/02/14 20:33:32 joerg Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.4 2023/07/05 22:42:48 riastradh Exp $
LIB= h_helper_symver_dso
SRCS= h_helper_symver_dso1.c
@@ -9,16 +7,9 @@ LIBDIR= ${TESTSBASE}/libexec/ld.elf_so/
SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so/h_helper_symver_dso1
SHLIB_MAJOR= 1
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
FILESDIR= ${TESTSBASE}/libexec/ld.elf_so/h_helper_symver_dso1
LDFLAGS.lib${LIB} += -Wl,--version-script=${.CURDIR}/h_helper_symver_dso1.map
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile:1.3 src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile:1.4
--- src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile:1.3 Fri Feb 14 20:33:32 2014
+++ src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile Wed Jul 5 22:42:48 2023
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/02/14 20:33:32 joerg Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.4 2023/07/05 22:42:48 riastradh Exp $
LIB= h_helper_symver_dso
SRCS= h_helper_symver_dso2.c
@@ -9,15 +7,8 @@ LIBDIR= ${TESTSBASE}/libexec/ld.elf_so/
SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so/h_helper_symver_dso2
SHLIB_MAJOR= 1
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
FILESDIR= ${TESTSBASE}/libexec/ld.elf_so/h_helper_symver_dso2
LDFLAGS.lib${LIB} += -Wl,--version-script=${.CURDIR}/h_helper_symver_dso2.map
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_use_dynamic/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_use_dynamic/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_use_dynamic/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_use_dynamic/Makefile:1.1 Thu Jun 1 20:50:19 2023
+++ src/tests/libexec/ld.elf_so/helper_use_dynamic/Makefile Wed Jul 5 22:42:48 2023
@@ -1,22 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2023/06/01 20:50:19 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2023/07/05 22:42:48 riastradh Exp $
LIB= h_use_dynamic
SRCS= h_use_dynamic.c
-DEF_DIR!= cd ${.CURDIR}/../helper_def_dynamic && ${PRINTOBJDIR}
+DEF_DIR_cmd= cd ${.CURDIR}/../helper_def_dynamic && ${PRINTOBJDIR}
+DEF_DIR= ${DEF_DIR_cmd:sh}
LDADD+= -Wl,-rpath,${TESTSDIR} -L${DEF_DIR} -lh_def_dynamic
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Index: src/tests/libexec/ld.elf_so/helper_use_static/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_use_static/Makefile:1.2 src/tests/libexec/ld.elf_so/helper_use_static/Makefile:1.3
--- src/tests/libexec/ld.elf_so/helper_use_static/Makefile:1.2 Wed May 31 00:46:11 2023
+++ src/tests/libexec/ld.elf_so/helper_use_static/Makefile Wed Jul 5 22:42:48 2023
@@ -1,22 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2023/05/31 00:46:11 riastradh Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.3 2023/07/05 22:42:48 riastradh Exp $
LIB= h_use_static
SRCS= h_use_static.c
-DEF_DIR!= cd ${.CURDIR}/../helper_def_static && ${PRINTOBJDIR}
+DEF_DIR_cmd= cd ${.CURDIR}/../helper_def_static && ${PRINTOBJDIR}
+DEF_DIR= ${DEF_DIR_cmd:sh}
LDADD+= -Wl,-rpath,${TESTSDIR} -L${DEF_DIR} -lh_def_static
-LIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIBDIR= ${TESTSBASE}/libexec/ld.elf_so
-SHLIB_MAJOR= 1
-
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-MKLINT= no
-
-NOMAN= # defined
-
-.include <bsd.lib.mk>
+.include "../helper.mk"
Added files:
Index: src/tests/libexec/ld.elf_so/helper.mk
diff -u /dev/null src/tests/libexec/ld.elf_so/helper.mk:1.1
--- /dev/null Wed Jul 5 22:42:48 2023
+++ src/tests/libexec/ld.elf_so/helper.mk Wed Jul 5 22:42:46 2023
@@ -0,0 +1,18 @@
+# $NetBSD: helper.mk,v 1.1 2023/07/05 22:42:46 riastradh Exp $
+
+# Makefile fragment for building a helper library used by ld.elf_so
+# tests. All we need to install is lib${LIB}.so and lib${LIB}.so.1.
+# No man page, no lint library, no static libraries of any sort.
+
+LIBDIR?= ${TESTSBASE}/libexec/ld.elf_so
+SHLIBDIR?= ${TESTSBASE}/libexec/ld.elf_so
+SHLIB_MAJOR?= 1
+
+NODEBUGLIB= # defined
+NOLINT= # defined
+NOMAN= # defined
+NOPICINSTALL= # defined
+NOPROFILE= # defined
+NOSTATICLIB= # defined
+
+.include <bsd.lib.mk>
