head 1.7; access; symbols netbsd-11-0-RC6:1.7 netbsd-11-0-RC5:1.7 netbsd-11-0-RC4:1.7 netbsd-11-0-RC3:1.7 netbsd-11-0-RC2:1.7 netbsd-11-0-RC1:1.7 perseant-exfatfs-base-20250801:1.7 netbsd-11:1.7.0.16 netbsd-11-base:1.7 netbsd-10-1-RELEASE:1.7 perseant-exfatfs-base-20240630:1.7 perseant-exfatfs:1.7.0.14 perseant-exfatfs-base:1.7 netbsd-8-3-RELEASE:1.4 netbsd-9-4-RELEASE:1.7 netbsd-10-0-RELEASE:1.7 netbsd-10-0-RC6:1.7 netbsd-10-0-RC5:1.7 netbsd-10-0-RC4:1.7 netbsd-10-0-RC3:1.7 netbsd-10-0-RC2:1.7 netbsd-10-0-RC1:1.7 netbsd-10:1.7.0.12 netbsd-10-base:1.7 netbsd-9-3-RELEASE:1.7 cjep_sun2x-base1:1.7 cjep_sun2x:1.7.0.10 cjep_sun2x-base:1.7 cjep_staticlib_x-base1:1.7 netbsd-9-2-RELEASE:1.7 cjep_staticlib_x:1.7.0.8 cjep_staticlib_x-base:1.7 netbsd-9-1-RELEASE:1.7 phil-wifi-20200421:1.7 phil-wifi-20200411:1.7 is-mlppp:1.7.0.6 is-mlppp-base:1.7 phil-wifi-20200406:1.7 netbsd-8-2-RELEASE:1.4 netbsd-9-0-RELEASE:1.7 netbsd-9-0-RC2:1.7 netbsd-9-0-RC1:1.7 phil-wifi-20191119:1.7 netbsd-9:1.7.0.4 netbsd-9-base:1.7 phil-wifi-20190609:1.7 netbsd-8-1-RELEASE:1.4 netbsd-8-1-RC1:1.4 pgoyette-compat-merge-20190127:1.4.14.2 pgoyette-compat-20190127:1.7 pgoyette-compat-20190118:1.7 pgoyette-compat-1226:1.7 pgoyette-compat-1126:1.7 pgoyette-compat-1020:1.7 pgoyette-compat-0930:1.7 pgoyette-compat-0906:1.7 netbsd-7-2-RELEASE:1.1.1.1 pgoyette-compat-0728:1.7 netbsd-8-0-RELEASE:1.4 phil-wifi:1.7.0.2 phil-wifi-base:1.7 pgoyette-compat-0625:1.7 netbsd-8-0-RC2:1.4 pgoyette-compat-0521:1.7 pgoyette-compat-0502:1.7 pgoyette-compat-0422:1.5 netbsd-8-0-RC1:1.4 pgoyette-compat-0415:1.5 pgoyette-compat-0407:1.5 pgoyette-compat-0330:1.5 pgoyette-compat-0322:1.5 pgoyette-compat-0315:1.5 netbsd-7-1-2-RELEASE:1.1.1.1 pgoyette-compat:1.4.0.14 pgoyette-compat-base:1.4 netbsd-7-1-1-RELEASE:1.1.1.1 matt-nb8-mediatek:1.4.0.12 matt-nb8-mediatek-base:1.4 perseant-stdc-iso10646:1.4.0.10 perseant-stdc-iso10646-base:1.4 netbsd-8:1.4.0.8 netbsd-8-base:1.4 prg-localcount2-base3:1.4 prg-localcount2-base2:1.4 prg-localcount2-base1:1.4 prg-localcount2:1.4.0.6 prg-localcount2-base:1.4 pgoyette-localcount-20170426:1.4 bouyer-socketcan-base1:1.4 pgoyette-localcount-20170320:1.4 netbsd-7-1:1.1.1.1.0.48 netbsd-7-1-RELEASE:1.1.1.1 netbsd-7-1-RC2:1.1.1.1 netbsd-7-nhusb-base-20170116:1.1.1.1 bouyer-socketcan:1.4.0.4 bouyer-socketcan-base:1.4 pgoyette-localcount-20170107:1.4 netbsd-7-1-RC1:1.1.1.1 pgoyette-localcount-20161104:1.4 netbsd-7-0-2-RELEASE:1.1.1.1 localcount-20160914:1.4 netbsd-7-nhusb:1.1.1.1.0.46 netbsd-7-nhusb-base:1.1.1.1 pgoyette-localcount-20160806:1.4 pgoyette-localcount-20160726:1.4 pgoyette-localcount:1.4.0.2 pgoyette-localcount-base:1.4 netbsd-7-0-1-RELEASE:1.1.1.1 netbsd-7-0:1.1.1.1.0.44 netbsd-7-0-RELEASE:1.1.1.1 netbsd-7-0-RC3:1.1.1.1 netbsd-7-0-RC2:1.1.1.1 netbsd-7-0-RC1:1.1.1.1 netbsd-5-2-3-RELEASE:1.1.1.1 netbsd-5-1-5-RELEASE:1.1.1.1 netbsd-6-0-6-RELEASE:1.1.1.1 netbsd-6-1-5-RELEASE:1.1.1.1 netbsd-7:1.1.1.1.0.42 netbsd-7-base:1.1.1.1 yamt-pagecache-base9:1.1.1.1 yamt-pagecache-tag8:1.1.1.1 netbsd-6-1-4-RELEASE:1.1.1.1 netbsd-6-0-5-RELEASE:1.1.1.1 tls-earlyentropy:1.1.1.1.0.40 tls-earlyentropy-base:1.1.1.1 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.1 riastradh-drm2-base3:1.1.1.1 netbsd-6-1-3-RELEASE:1.1.1.1 netbsd-6-0-4-RELEASE:1.1.1.1 netbsd-5-2-2-RELEASE:1.1.1.1 netbsd-5-1-4-RELEASE:1.1.1.1 netbsd-6-1-2-RELEASE:1.1.1.1 netbsd-6-0-3-RELEASE:1.1.1.1 netbsd-5-2-1-RELEASE:1.1.1.1 netbsd-5-1-3-RELEASE:1.1.1.1 netbsd-6-1-1-RELEASE:1.1.1.1 riastradh-drm2-base2:1.1.1.1 riastradh-drm2-base1:1.1.1.1 riastradh-drm2:1.1.1.1.0.34 riastradh-drm2-base:1.1.1.1 netbsd-6-1:1.1.1.1.0.38 netbsd-6-0-2-RELEASE:1.1.1.1 netbsd-6-1-RELEASE:1.1.1.1 netbsd-6-1-RC4:1.1.1.1 netbsd-6-1-RC3:1.1.1.1 agc-symver:1.1.1.1.0.36 agc-symver-base:1.1.1.1 netbsd-6-1-RC2:1.1.1.1 netbsd-6-1-RC1:1.1.1.1 yamt-pagecache-base8:1.1.1.1 netbsd-5-2:1.1.1.1.0.32 netbsd-6-0-1-RELEASE:1.1.1.1 yamt-pagecache-base7:1.1.1.1 netbsd-5-2-RELEASE:1.1.1.1 netbsd-5-2-RC1:1.1.1.1 matt-nb6-plus-nbase:1.1.1.1 yamt-pagecache-base6:1.1.1.1 netbsd-6-0:1.1.1.1.0.30 netbsd-6-0-RELEASE:1.1.1.1 netbsd-6-0-RC2:1.1.1.1 tls-maxphys:1.1.1.1.0.28 tls-maxphys-base:1.1.1.1 matt-nb6-plus:1.1.1.1.0.26 matt-nb6-plus-base:1.1.1.1 netbsd-6-0-RC1:1.1.1.1 yamt-pagecache-base5:1.1.1.1 yamt-pagecache-base4:1.1.1.1 netbsd-6:1.1.1.1.0.24 netbsd-6-base:1.1.1.1 netbsd-5-1-2-RELEASE:1.1.1.1 netbsd-5-1-1-RELEASE:1.1.1.1 yamt-pagecache-base3:1.1.1.1 yamt-pagecache-base2:1.1.1.1 yamt-pagecache:1.1.1.1.0.4 yamt-pagecache-base:1.1.1.1 cherry-xenmp:1.1.1.1.0.22 cherry-xenmp-base:1.1.1.1 bouyer-quota2-nbase:1.1.1.1 bouyer-quota2:1.1.1.1.0.20 bouyer-quota2-base:1.1.1.1 matt-mips64-premerge-20101231:1.1.1.1 matt-nb5-mips64-premerge-20101231:1.1.1.1 matt-nb5-pq3:1.1.1.1.0.18 matt-nb5-pq3-base:1.1.1.1 netbsd-5-1:1.1.1.1.0.16 netbsd-5-1-RELEASE:1.1.1.1 netbsd-5-1-RC4:1.1.1.1 matt-nb5-mips64-k15:1.1.1.1 netbsd-5-1-RC3:1.1.1.1 netbsd-5-1-RC2:1.1.1.1 netbsd-5-1-RC1:1.1.1.1 netbsd-5-0-2-RELEASE:1.1.1.1 matt-nb5-mips64-premerge-20091211:1.1.1.1 matt-premerge-20091211:1.1.1.1 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1.1.1 matt-nb4-mips64-k7-u2a-k9b:1.1.1.1 matt-nb5-mips64-u1-k1-k5:1.1.1.1 matt-nb5-mips64:1.1.1.1.0.14 netbsd-5-0-1-RELEASE:1.1.1.1 jym-xensuspend-nbase:1.1.1.1 netbsd-5-0:1.1.1.1.0.12 netbsd-5-0-RELEASE:1.1.1.1 netbsd-5-0-RC4:1.1.1.1 netbsd-5-0-RC3:1.1.1.1 netbsd-5-0-RC2:1.1.1.1 jym-xensuspend:1.1.1.1.0.10 jym-xensuspend-base:1.1.1.1 netbsd-5-0-RC1:1.1.1.1 haad-dm-base:1.1.1.1 haad-dm-base2:1.1.1.1 haad-nbase2:1.1.1.1 netbsd-5:1.1.1.1.0.8 netbsd-5-base:1.1.1.1 matt-mips64-base2:1.1.1.1 haad-dm:1.1.1.1.0.6 haad-dm-base1:1.1.1.1 wrstuden-revivesa-base-3:1.1.1.1 wrstuden-revivesa:1.1.1.1.0.2 wrstuden-revivesa-base-2:1.1.1.1 oinkoink:1.1.1.1 mrg-and-rtr:1.1.1; locks; strict; comment @# @; 1.7 date 2018.05.01.19.59.44; author christos; state Exp; branches; next 1.6; commitid 10Ge8dYtIFEjeDAA; 1.6 date 2018.05.01.17.42.01; author christos; state Exp; branches; next 1.5; commitid i6FGblQHWWmqtCAA; 1.5 date 2018.03.14.23.41.05; author mrg; state Exp; branches; next 1.4; commitid Sf9BbGWRPaiGZtuA; 1.4 date 2015.06.26.02.43.26; author matt; state Exp; branches 1.4.14.1; next 1.3; commitid tNqFQR18AnZWVSqy; 1.3 date 2015.06.25.01.38.09; author matt; state Exp; branches; next 1.2; commitid 3jrWNJjjs5LoBKqy; 1.2 date 2015.06.24.22.20.25; author matt; state Exp; branches; next 1.1; commitid DfokHb46UCq7vJqy; 1.1 date 2008.07.29.05.01.23; author mrg; state Exp; branches 1.1.1.1; next ; 1.4.14.1 date 2018.03.15.09.12.00; author pgoyette; state Exp; branches; next 1.4.14.2; commitid lb7w3QtkrVH4axuA; 1.4.14.2 date 2018.05.02.07.20.00; author pgoyette; state Exp; branches; next ; commitid o3kRuNRzl9360HAA; 1.1.1.1 date 2008.07.29.05.01.23; author mrg; state Exp; branches 1.1.1.1.2.1 1.1.1.1.6.1; next ; 1.1.1.1.2.1 date 2008.07.29.05.01.23; author wrstuden; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2008.09.18.05.18.54; author wrstuden; state Exp; branches; next ; 1.1.1.1.6.1 date 2008.07.29.05.01.23; author haad; state dead; branches; next 1.1.1.1.6.2; 1.1.1.1.6.2 date 2008.10.19.22.41.28; author haad; state Exp; branches; next ; desc @@ 1.7 log @Create a new bsd.hostinit.mk file and put the build definitions for all host programs there; make all Makefiles that use bsd.hostprog.mk include it. Namely turn off MKREPRO and don't make lint, man pages, info files etc. Remove the Makefile.inc files that contained these same settings, and remove the settings from Makefile.host @ text @# $NetBSD: Makefile,v 1.6 2018/05/01 17:42:01 christos Exp $ .include .PATH: ${X11SRCDIR.X11}/src/util PROG?= makekeys SRCS= makekeys.c .if !make(obj) && !exists(${DESTDIR}${X11INCDIR}/X.h) CLEANFILES+= X11 CPPFLAGS+= -I. XPINCS= X.h Xarch.h Xos.h Xosdefs.h keysymdef.h Xfuncproto.h X11INCS= Xlib.h Xresource.h CLEANFILES+= ${XPINCS} ${X11INCS} .if !make(clean) && !make(cleandir) .BEGIN: @@rm -f ${.OBJDIR}/X11 && ln -s . X11 .for i in ${XPINCS} @@rm -f $i && ln -s ${X11SRCDIR.xorgproto}/include/X11/$i . .endfor .for i in ${X11INCS} @@rm -f $i && ln -s ${X11SRCDIR.X11}/include/X11/$i . .endfor .endif .else CPPFLAGS+= -I${DESTDIR}${X11INCDIR} .endif .include .include @ 1.6 log @Apply the same fixes from the regular tools dir: PR/53238: Robert Elz: Disable MKREPRO in tools; the host compiler might not support the necessary options. This is done thusly: 1. Create Makefile.inc and set MKREPRO=no in it. Change the Makefiles that include bsd.own.mk, to include bsd.init.mk which includes Makefile.inc first. This will also allow us to control other tools options from a single location if we need to. 2. Centralize NOMAN handling. XXX: pullup-8 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2018/03/14 23:41:05 mrg Exp $ d3 1 a3 1 .include @ 1.5 log @complete the switch to xorgproto over *proto split packages - remove old package makefiles - update makekeys for Xfuncproto.h being a real file now - clean up deleted package X11SRCDIR.pkg settings this should be functionally equivalent. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2015/06/26 02:43:26 matt Exp $ d3 1 a3 3 NOMAN= 1 .include @ 1.4 log @Don't recreate link if clean or cleandir @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2015/06/25 01:38:09 matt Exp $ d14 1 a14 1 XPINCS= X.h Xarch.h Xos.h Xosdefs.h keysymdef.h d16 1 a16 1 CLEANFILES+= ${XPINCS} ${X11INCS} Xfuncproto.h d21 1 a21 1 @@rm -f $i && ln -s ${X11SRCDIR.xproto}/$i . a27 7 Xfuncproto.h: ${X11SRCDIR.xproto}/Xfuncproto.h.in ${TOOL_SED} -e 's/#undef NARROWPROTO/#define NARROWPROTO/' \ -e 's/#undef FUNCPROTO/#define FUNCPROTO 15/' \ < ${.ALLSRC} > ${.TARGET} makekeys.lo makekeys.o makekeys.d: Xfuncproto.h @ 1.4.14.1 log @Synch with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2018/03/14 23:41:05 mrg Exp $ d14 1 a14 1 XPINCS= X.h Xarch.h Xos.h Xosdefs.h keysymdef.h Xfuncproto.h d16 1 a16 1 CLEANFILES+= ${XPINCS} ${X11INCS} d21 1 a21 1 @@rm -f $i && ln -s ${X11SRCDIR.xorgproto}/include/X11/$i . d28 7 @ 1.4.14.2 log @Synch with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2018/05/01 19:59:44 christos Exp $ d3 3 a5 1 .include @ 1.3 log @Make this work without a populated X11 include heirarchy. It's ugly but it works. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2015/06/24 22:20:25 matt Exp $ d17 1 d19 1 a19 1 @@rm -f X11 && ln -s . X11 d26 1 @ 1.2 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: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $ d11 23 d35 1 @ 1.1 log @Initial revision @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2003/09/30 06:41:31 lukem Exp $ d9 3 a11 2 HOSTPROG= makekeys HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} d14 1 a14 1 .include @ 1.1.1.1 log @initial import of the crossbuild framework for modular Xorg. this is heavily based upon the work rtr@@ did on src/x11, but hacked to work for modern modular Xorg source split. the sources will live in xsrc/external/mit//dist. documentation on using this will come when the above directories are fully populated. there are 192 of them so it may take some time before that is completed. @ text @@ 1.1.1.1.6.1 log @file Makefile was added on branch haad-dm on 2008-10-19 22:41:28 +0000 @ text @d1 13 @ 1.1.1.1.6.2 log @Sync with HEAD. @ text @a0 13 # $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $ NOMAN= 1 .include .PATH: ${X11SRCDIR.X11}/src/util HOSTPROG= makekeys HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} .include .include @ 1.1.1.1.2.1 log @file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:54 +0000 @ text @d1 13 @ 1.1.1.1.2.2 log @Sync with wrstuden-revivesa-base-2. @ text @a0 13 # $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $ NOMAN= 1 .include .PATH: ${X11SRCDIR.X11}/src/util HOSTPROG= makekeys HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} .include .include @