head 1.13; access; symbols netbsd-10-0-RELEASE:1.13 netbsd-10-0-RC6:1.13 netbsd-10-0-RC5:1.13 netbsd-10-0-RC4:1.13 netbsd-10-0-RC3:1.13 netbsd-10-0-RC2:1.13 netbsd-10-0-RC1:1.13 netbsd-10:1.13.0.26 netbsd-10-base:1.13 netbsd-9-3-RELEASE:1.13 cjep_sun2x-base1:1.13 cjep_sun2x:1.13.0.24 cjep_sun2x-base:1.13 cjep_staticlib_x-base1:1.13 netbsd-9-2-RELEASE:1.13 cjep_staticlib_x:1.13.0.22 cjep_staticlib_x-base:1.13 netbsd-9-1-RELEASE:1.13 phil-wifi-20200421:1.13 phil-wifi-20200411:1.13 is-mlppp:1.13.0.20 is-mlppp-base:1.13 phil-wifi-20200406:1.13 netbsd-8-2-RELEASE:1.13 netbsd-9-0-RELEASE:1.13 netbsd-9-0-RC2:1.13 netbsd-9-0-RC1:1.13 phil-wifi-20191119:1.13 netbsd-9:1.13.0.18 netbsd-9-base:1.13 phil-wifi-20190609:1.13 netbsd-8-1-RELEASE:1.13 netbsd-8-1-RC1:1.13 pgoyette-compat-merge-20190127:1.13 pgoyette-compat-20190127:1.13 pgoyette-compat-20190118:1.13 pgoyette-compat-1226:1.13 pgoyette-compat-1126:1.13 pgoyette-compat-1020:1.13 pgoyette-compat-0930:1.13 pgoyette-compat-0906:1.13 netbsd-7-2-RELEASE:1.8 pgoyette-compat-0728:1.13 netbsd-8-0-RELEASE:1.13 phil-wifi:1.13.0.16 phil-wifi-base:1.13 pgoyette-compat-0625:1.13 netbsd-8-0-RC2:1.13 pgoyette-compat-0521:1.13 pgoyette-compat-0502:1.13 pgoyette-compat-0422:1.13 netbsd-8-0-RC1:1.13 pgoyette-compat-0415:1.13 pgoyette-compat-0407:1.13 pgoyette-compat-0330:1.13 pgoyette-compat-0322:1.13 pgoyette-compat-0315:1.13 netbsd-7-1-2-RELEASE:1.8 pgoyette-compat:1.13.0.14 pgoyette-compat-base:1.13 netbsd-7-1-1-RELEASE:1.8 matt-nb8-mediatek:1.13.0.12 matt-nb8-mediatek-base:1.13 perseant-stdc-iso10646:1.13.0.10 perseant-stdc-iso10646-base:1.13 netbsd-8:1.13.0.8 netbsd-8-base:1.13 prg-localcount2-base3:1.13 prg-localcount2-base2:1.13 prg-localcount2-base1:1.13 prg-localcount2:1.13.0.6 prg-localcount2-base:1.13 pgoyette-localcount-20170426:1.13 bouyer-socketcan-base1:1.13 pgoyette-localcount-20170320:1.13 netbsd-7-1:1.8.0.18 netbsd-7-1-RELEASE:1.8 netbsd-7-1-RC2:1.8 netbsd-7-nhusb-base-20170116:1.8 bouyer-socketcan:1.13.0.4 bouyer-socketcan-base:1.13 pgoyette-localcount-20170107:1.13 netbsd-7-1-RC1:1.8 pgoyette-localcount-20161104:1.13 netbsd-7-0-2-RELEASE:1.8 localcount-20160914:1.13 netbsd-7-nhusb:1.8.0.16 netbsd-7-nhusb-base:1.8 pgoyette-localcount-20160806:1.13 pgoyette-localcount-20160726:1.13 pgoyette-localcount:1.13.0.2 pgoyette-localcount-base:1.13 netbsd-7-0-1-RELEASE:1.8 netbsd-7-0:1.8.0.14 netbsd-7-0-RELEASE:1.8 netbsd-7-0-RC3:1.8 netbsd-7-0-RC2:1.8 netbsd-7-0-RC1:1.8 netbsd-5-2-3-RELEASE:1.5.2.3 netbsd-6-0-6-RELEASE:1.7 netbsd-6-1-5-RELEASE:1.7 netbsd-7:1.8.0.12 netbsd-7-base:1.8 yamt-pagecache-base9:1.8 yamt-pagecache-tag8:1.7.4.1 netbsd-6-1-4-RELEASE:1.7 netbsd-6-0-5-RELEASE:1.7 tls-earlyentropy:1.8.0.10 tls-earlyentropy-base:1.8 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.8 riastradh-drm2-base3:1.8 netbsd-6-1-3-RELEASE:1.7 netbsd-6-0-4-RELEASE:1.7 netbsd-5-2-2-RELEASE:1.5.2.3 netbsd-6-1-2-RELEASE:1.7 netbsd-6-0-3-RELEASE:1.7 netbsd-5-2-1-RELEASE:1.5.2.3 netbsd-6-1-1-RELEASE:1.7 riastradh-drm2-base2:1.8 riastradh-drm2-base1:1.8 riastradh-drm2:1.8.0.4 riastradh-drm2-base:1.8 netbsd-6-1:1.7.0.12 netbsd-6-0-2-RELEASE:1.7 netbsd-6-1-RELEASE:1.7 khorben-n900:1.8.0.8 netbsd-6-1-RC4:1.7 netbsd-6-1-RC3:1.7 agc-symver:1.8.0.6 agc-symver-base:1.8 netbsd-6-1-RC2:1.7 netbsd-6-1-RC1:1.7 yamt-pagecache-base8:1.8 netbsd-5-2:1.5.2.3.0.2 netbsd-6-0-1-RELEASE:1.7 yamt-pagecache-base7:1.8 netbsd-5-2-RELEASE:1.5.2.3 netbsd-5-2-RC1:1.5.2.3 matt-nb6-plus-nbase:1.7 yamt-pagecache-base6:1.8 netbsd-6-0:1.7.0.10 netbsd-6-0-RELEASE:1.7 netbsd-6-0-RC2:1.7 tls-maxphys:1.8.0.2 tls-maxphys-base:1.8 matt-nb6-plus:1.7.0.8 matt-nb6-plus-base:1.7 netbsd-6-0-RC1:1.7 yamt-pagecache-base5:1.7 yamt-pagecache-base4:1.7 netbsd-6:1.7.0.6 netbsd-6-base:1.7 yamt-pagecache-base3:1.7 yamt-pagecache-base2:1.7 yamt-pagecache:1.7.0.4 yamt-pagecache-base:1.7 cherry-xenmp:1.7.0.2 cherry-xenmp-base:1.7 bouyer-quota2-nbase:1.7 bouyer-quota2:1.5.0.4 bouyer-quota2-base:1.7 netbsd-5:1.5.0.2 matt-mips64-premerge-20101231:1.5 matt-premerge-20091211:1.1; locks; strict; comment @# @; 1.13 date 2015.07.23.08.03.25; author mrg; state Exp; branches 1.13.16.1; next 1.12; commitid nfGa2DVpEPUUPnuy; 1.12 date 2015.06.27.16.21.07; author matt; state Exp; branches; next 1.11; commitid cOr7vQoBy7zfq5ry; 1.11 date 2015.06.24.22.20.24; author matt; state Exp; branches; next 1.10; commitid DfokHb46UCq7vJqy; 1.10 date 2015.06.22.00.11.33; author matt; state Exp; branches; next 1.9; commitid SKKbxhDBvgvidmqy; 1.9 date 2015.06.19.18.17.49; author matt; state Exp; branches; next 1.8; commitid dt4873TEAvlsk4qy; 1.8 date 2012.08.17.16.22.27; author joerg; state Exp; branches; next 1.7; 1.7 date 2011.01.31.10.58.14; author matt; state Exp; branches 1.7.4.1; next 1.6; 1.6 date 2011.01.20.18.43.52; author matt; state Exp; branches; next 1.5; 1.5 date 2010.12.03.21.38.48; author plunky; state Exp; branches 1.5.2.1 1.5.4.1; next 1.4; 1.4 date 2010.11.02.16.34.33; author joerg; state Exp; branches; next 1.3; 1.3 date 2009.12.15.05.23.25; author mrg; state Exp; branches; next 1.2; 1.2 date 2009.12.15.04.12.43; author mrg; state Exp; branches; next 1.1; 1.1 date 2009.12.13.09.27.13; author mrg; state Exp; branches; next ; 1.13.16.1 date 2020.04.21.18.41.25; author martin; state dead; branches; next 1.13.16.2; commitid 86tA4aEmdr3VCh5C; 1.13.16.2 date 2020.04.21.19.37.52; author martin; state Exp; branches; next ; commitid x6IB64bYH9UmWh5C; 1.7.4.1 date 2012.10.30.18.46.16; author yamt; state Exp; branches; next ; 1.5.2.1 date 2010.12.03.21.38.48; author riz; state dead; branches; next 1.5.2.2; 1.5.2.2 date 2011.01.06.05.19.55; author riz; state Exp; branches; next 1.5.2.3; 1.5.2.3 date 2011.01.07.18.25.21; author riz; state Exp; branches; next ; 1.5.4.1 date 2011.02.08.16.18.29; author bouyer; state Exp; branches; next ; desc @@ 1.13 log @remove the xfree86 reachover makefiles and the vast majority of the support in the rest of the source tree. X11 sets could use some cleaning up perhaps (just deletion, as we've never really marked the old X11R6 as obsolete for native xorg using platforms so far either.) @ text @# $NetBSD: compatsubdir.mk,v 1.12 2015/06/27 16:21:07 matt Exp $ # Build netbsd libraries. .include TARGETS+= build_install .if ${MKCOMPAT} != "no" .if !make(includes) # make sure we get an objdir built early enough .include MAKEDIRTARGETENV= .if defined(MAKEOBJDIRPREFIX) MAKEDIRTARGETENV+= unset MAKEOBJDIRPREFIX && .endif MAKEDIRTARGETENV+= MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}' MAKEDIRTARGETENV+= MKOBJDIRS=yes MKSHARE=no MAKEDIRTARGETENV+= BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} .if defined(BOOTSTRAP_SUBDIRS) SUBDIR= ${BOOTSTRAP_SUBDIRS} .else SUBDIR= ../../../lib .WAIT \ ../../../libexec/ld.elf_so .if ${MKCOMPATTESTS} != "no" SUBDIR+= ../../../tests SUBDIR+= ../../../tests/share # because MKSHARE=no above SUBDIR+= ../../../external/bsd/atf/tests .endif .if ${MKCOMPATX11} != no && ${MKX11} != no && make(obj) SUBDIR+= ../../../external/mit/xorg/lib .endif # } MKX11 .endif # } BOOTSTRAP_SUBDIRS .include .endif .endif @ 1.13.16.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.13 2015/07/23 08:03:25 mrg Exp $ @ 1.13.16.2 log @Ooops, restore accidently removed files from merge mishap @ text @@ 1.12 log @Add MKCOMPATX11 knob for making X11 compat libraries. @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.11 2015/06/24 22:20:24 matt Exp $ d33 1 a33 1 .if ${MKCOMPATX11} != no && ${MKX11} != no && ${X11FLAVOUR} == "Xorg" && make(obj) @ 1.11 log @Support building the xorg X11 libraries under MKCOMPAT. Add XORG_MACHINE_ARCH to compat's bsd.*.mk Turn xorg makekeys and makestrs into real host tools which are installed into ${TOOLSDIR} @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.10 2015/06/22 00:11:33 matt Exp $ d33 1 a33 1 .if ${MKX11} != no && ${X11FLAVOUR} == "Xorg" && make(obj) @ 1.10 log @Add tests/share/mk and external/bsd/atf/tests/atf for MKCOMPATTESTS @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.9 2015/06/19 18:17:49 matt Exp $ d33 4 a36 1 .endif @ 1.9 log @Add support for MKCOMPATTESTS @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.8 2012/08/17 16:22:27 joerg Exp $ d30 2 @ 1.8 log @Implement build_install in src/lib/Makefile, which traverses the subdirectories and invokes dependall/install. Do this in groups delimited by .WAIT to ensure that depending libraries can use the installed versions and don't need to know the locations in the source tree. Use this new target in src/Makefile to replace most of the adhoc library logic with two special cases, src/lib and src/compat. Adjust sys/Makefile to include the module directory when building them. Add some necessary .WAITs in src/lib/Makefile to reflect the dependencies from src/Makefile and also add the rump libraries here. @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.7 2011/01/31 10:58:14 matt Exp $ d28 3 @ 1.7 log @if using MAKEOBJDIRPREFIX, make sure to unset it since it would override the use of MAKEOBJDIR. @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.6 2011/01/20 18:43:52 matt Exp $ d7 2 @ 1.7.4.1 log @sync with head @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.7 2011/01/31 10:58:14 matt Exp $ a6 2 TARGETS+= build_install @ 1.6 log @Change to use MAKEOBJDIR instead of MAKEOBJDIRPREFIX @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.5 2010/12/03 21:38:48 plunky Exp $ d13 7 a19 1 MAKEDIRTARGETENV= MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}' MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} @ 1.5 log @Remove the do-external-lib and do-gnu-lib targets, along with external/lib/Makefile and crypto/external/lib/Makefile, replacing them all with SUBDIRs directly from lib/Makefile. compat/compatsubdirs.mk becomes simpler now, as everything is built from lib/Makefile, meaning all the libraries will now be built under compat so update the set lists to account for that. @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.4 2010/11/02 16:34:33 joerg Exp $ d13 1 a13 2 # XXX make this use MAKEOBJDIR MAKEDIRTARGETENV= MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} @ 1.5.4.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.7 2011/01/31 10:58:14 matt Exp $ d13 2 a14 7 MAKEDIRTARGETENV= .if defined(MAKEOBJDIRPREFIX) MAKEDIRTARGETENV+= unset MAKEOBJDIRPREFIX && .endif MAKEDIRTARGETENV+= MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}' MAKEDIRTARGETENV+= MKOBJDIRS=yes MKSHARE=no MAKEDIRTARGETENV+= BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} @ 1.5.2.1 log @file compatsubdir.mk was added on branch netbsd-5 on 2011-01-06 05:19:55 +0000 @ text @d1 26 @ 1.5.2.2 log @Apply patch (requested by mrg in ticket #1499): src/compat version 2. this allows building any number of alternate library / program target ABIs. rather than duplicating the list of subdirs and Makefiles to build, it re-traverses the necessary ones. details: - add support for MAKEDIRTARGETENV to share/mk - renames LD32DIR to MLIBDIR - fixes library builds for some subdirs (more was built than needed) - fixes /bin & /sbin apps in compat mode - reduces complexity in src/compat and the rest of the tree - updates ldd netbsd32 support @ text @a0 76 # $NetBSD: compatsubdir.mk,v 1.4 2010/11/02 16:34:33 joerg Exp $ # Build netbsd libraries. .include .if ${MKCOMPAT} != "no" .if !make(includes) # make sure we get an objdir built early enough .include # XXX make this use MAKEOBJDIR MAKEDIRTARGETENV= MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} # XXX fix the "library" list to include all 'external' libs? .if defined(BOOTSTRAP_SUBDIRS) SUBDIR= ${BOOTSTRAP_SUBDIRS} .else SUBDIR= ../../../gnu/lib/crtstuff4 .WAIT \ ../../../lib/csu .WAIT \ ../../../gnu/lib/libgcc4 .WAIT \ ../../../lib/libc .WAIT \ ../../../lib/libutil .WAIT \ ../../../lib .WAIT \ ../../../gnu/lib \ ../../../libexec/ld.elf_so .if (${MKLDAP} != "no") SUBDIR+= ../../../external/bsd/openldap/lib .endif .endif .include .endif .endif # $NetBSD: compatsubdir.mk,v 1.4 2010/11/02 16:34:33 joerg Exp $ # Build netbsd libraries. .include .if ${MKCOMPAT} != "no" .if !make(includes) # make sure we get an objdir built early enough .include # XXX make this use MAKEOBJDIR MAKEDIRTARGETENV= MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} # XXX fix the "library" list to include all 'external' libs? .if defined(BOOTSTRAP_SUBDIRS) SUBDIR= ${BOOTSTRAP_SUBDIRS} .else SUBDIR= ../../../gnu/lib/crtstuff4 .WAIT \ ../../../lib/csu .WAIT \ ../../../gnu/lib/libgcc4 .WAIT \ ../../../lib/libc .WAIT \ ../../../lib/libutil .WAIT \ ../../../lib .WAIT \ ../../../gnu/lib \ ../../../libexec/ld.elf_so .if (${MKLDAP} != "no") SUBDIR+= ../../../external/bsd/openldap/lib .endif .endif .include .endif .endif @ 1.5.2.3 log @Clean up for ticket #1499 - doubled content, not sure how it happened. @ text @d1 39 a39 1 # $NetBSD: compatsubdir.mk,v 1.5.2.2 2011/01/06 05:19:55 riz Exp $ @ 1.4 log @Hook up xz into the build system. @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.3 2009/12/15 05:23:25 mrg Exp $ a15 1 # XXX fix the "library" list to include all 'external' libs? d19 1 a19 11 SUBDIR= ../../../gnu/lib/crtstuff4 .WAIT \ ../../../lib/csu .WAIT \ ../../../gnu/lib/libgcc4 .WAIT \ ../../../lib/libc .WAIT \ ../../../lib/libutil .WAIT \ ../../../lib .WAIT \ ../../../gnu/lib \ ../../../external/bsd/bind/lib \ ../../../external/bsd/libevent/lib \ ../../../external/bsd/file/lib \ ../../../external/public-domain/xz/lib \ a20 17 .if ${MKATF} != "no" SUBDIR+= ../../../external/bsd/atf/lib .endif .if (${MKLDAP} != "no") SUBDIR+= ../../../external/bsd/openldap/lib .endif .if (${MKBINUTILS} != "no") SUBDIR+= ../../../external/gpl3/binutils/lib .endif .if (${MKISCSI} != "no") SUBDIR+= ../../../external/bsd/iscsi/lib .endif @ 1.3 log @add iscsi/lib @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.2 2009/12/15 04:12:43 mrg Exp $ d30 1 @ 1.2 log @don't build atf, openldap or binutils if their MK* == "no". @ text @d1 1 a1 1 # $NetBSD: compatsubdir.mk,v 1.1 2009/12/13 09:27:13 mrg Exp $ d44 4 @ 1.1 log @- move the per-platform subdir list into archdirs.mk - move the per-ABI subdir list into compatsubdir.mk. use the new MAKEDIRTARGETENV support to force a new objdir for compat library builds, and simply traverse over the normal src path once for each ABI to be built. this eliminates all the shadow Makefile's for every library, and allows multiple compat ABIs to be built for a single platform, such as both o32 and n64 for mips64's default n32. - compat/Makefile is merely a subdir provider now, and takes the real information from archdirs.mk @ text @d1 1 a1 1 # $NetBSD$ a26 1 ../../../external/bsd/atf/lib \ a29 2 ../../../external/bsd/openldap/lib \ ../../../external/gpl3/binutils/lib \ d31 13 @