head 1.11; access; symbols netbsd-11-0-RC4:1.11 netbsd-11-0-RC3:1.11 netbsd-11-0-RC2:1.11 netbsd-11-0-RC1:1.11 perseant-exfatfs-base-20250801:1.11 netbsd-11:1.11.0.6 netbsd-11-base:1.11 netbsd-10-1-RELEASE:1.11 perseant-exfatfs-base-20240630:1.11 perseant-exfatfs:1.11.0.4 perseant-exfatfs-base:1.11 netbsd-8-3-RELEASE:1.8 netbsd-9-4-RELEASE:1.9 netbsd-10-0-RELEASE:1.11 netbsd-10-0-RC6:1.11 netbsd-10-0-RC5:1.11 netbsd-10-0-RC4:1.11 netbsd-10-0-RC3:1.11 netbsd-10-0-RC2:1.11 netbsd-10-0-RC1:1.11 netbsd-10:1.11.0.2 netbsd-10-base:1.11 netbsd-9-3-RELEASE:1.9 cjep_sun2x-base1:1.9 cjep_sun2x:1.9.0.8 cjep_sun2x-base:1.9 cjep_staticlib_x-base1:1.9 netbsd-9-2-RELEASE:1.9 cjep_staticlib_x:1.9.0.6 cjep_staticlib_x-base:1.9 netbsd-9-1-RELEASE:1.9 phil-wifi-20200421:1.9 phil-wifi-20200411:1.9 is-mlppp:1.9.0.4 is-mlppp-base:1.9 phil-wifi-20200406:1.9 netbsd-8-2-RELEASE:1.8 netbsd-9-0-RELEASE:1.9 netbsd-9-0-RC2:1.9 netbsd-9-0-RC1:1.9 phil-wifi-20191119:1.9 netbsd-9:1.9.0.2 netbsd-9-base:1.9 phil-wifi-20190609:1.9 netbsd-8-1-RELEASE:1.8 netbsd-8-1-RC1:1.8 pgoyette-compat-merge-20190127:1.8 pgoyette-compat-20190127:1.8 pgoyette-compat-20190118:1.8 pgoyette-compat-1226:1.8 pgoyette-compat-1126:1.8 pgoyette-compat-1020:1.8 pgoyette-compat-0930:1.8 pgoyette-compat-0906:1.8 netbsd-7-2-RELEASE:1.6 pgoyette-compat-0728:1.8 netbsd-8-0-RELEASE:1.8 phil-wifi:1.8.0.16 phil-wifi-base:1.8 pgoyette-compat-0625:1.8 netbsd-8-0-RC2:1.8 pgoyette-compat-0521:1.8 pgoyette-compat-0502:1.8 pgoyette-compat-0422:1.8 netbsd-8-0-RC1:1.8 pgoyette-compat-0415:1.8 pgoyette-compat-0407:1.8 pgoyette-compat-0330:1.8 pgoyette-compat-0322:1.8 pgoyette-compat-0315:1.8 netbsd-7-1-2-RELEASE:1.6 pgoyette-compat:1.8.0.14 pgoyette-compat-base:1.8 netbsd-7-1-1-RELEASE:1.6 matt-nb8-mediatek:1.8.0.12 matt-nb8-mediatek-base:1.8 perseant-stdc-iso10646:1.8.0.10 perseant-stdc-iso10646-base:1.8 netbsd-8:1.8.0.8 netbsd-8-base:1.8 prg-localcount2-base3:1.8 prg-localcount2-base2:1.8 prg-localcount2-base1:1.8 prg-localcount2:1.8.0.6 prg-localcount2-base:1.8 pgoyette-localcount-20170426:1.8 bouyer-socketcan-base1:1.8 pgoyette-localcount-20170320:1.8 netbsd-7-1:1.6.0.30 netbsd-7-1-RELEASE:1.6 netbsd-7-1-RC2:1.6 netbsd-7-nhusb-base-20170116:1.6 bouyer-socketcan:1.8.0.4 bouyer-socketcan-base:1.8 pgoyette-localcount-20170107:1.8 netbsd-7-1-RC1:1.6 pgoyette-localcount-20161104:1.8 netbsd-7-0-2-RELEASE:1.6 localcount-20160914:1.8 netbsd-7-nhusb:1.6.0.28 netbsd-7-nhusb-base:1.6 pgoyette-localcount-20160806:1.8 pgoyette-localcount-20160726:1.8 pgoyette-localcount:1.8.0.2 pgoyette-localcount-base:1.8 netbsd-7-0-1-RELEASE:1.6 netbsd-7-0:1.6.0.26 netbsd-7-0-RELEASE:1.6 netbsd-7-0-RC3:1.6 netbsd-7-0-RC2:1.6 netbsd-7-0-RC1:1.6 netbsd-5-2-3-RELEASE:1.1.2.3 netbsd-5-1-5-RELEASE:1.1.2.2 netbsd-6-0-6-RELEASE:1.6 netbsd-6-1-5-RELEASE:1.6 netbsd-7:1.6.0.24 netbsd-7-base:1.6 yamt-pagecache-base9:1.6 yamt-pagecache-tag8:1.6 netbsd-6-1-4-RELEASE:1.6 netbsd-6-0-5-RELEASE:1.6 tls-earlyentropy:1.6.0.22 tls-earlyentropy-base:1.6 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.6 riastradh-drm2-base3:1.6 netbsd-6-1-3-RELEASE:1.6 netbsd-6-0-4-RELEASE:1.6 netbsd-5-2-2-RELEASE:1.1.2.3 netbsd-5-1-4-RELEASE:1.1.2.2 netbsd-6-1-2-RELEASE:1.6 netbsd-6-0-3-RELEASE:1.6 netbsd-5-2-1-RELEASE:1.1.2.3 netbsd-5-1-3-RELEASE:1.1.2.2 netbsd-6-1-1-RELEASE:1.6 riastradh-drm2-base2:1.6 riastradh-drm2-base1:1.6 riastradh-drm2:1.6.0.16 riastradh-drm2-base:1.6 netbsd-6-1:1.6.0.20 netbsd-6-0-2-RELEASE:1.6 netbsd-6-1-RELEASE:1.6 netbsd-6-1-RC4:1.6 netbsd-6-1-RC3:1.6 agc-symver:1.6.0.18 agc-symver-base:1.6 netbsd-6-1-RC2:1.6 netbsd-6-1-RC1:1.6 yamt-pagecache-base8:1.6 netbsd-5-2:1.1.2.3.0.2 netbsd-6-0-1-RELEASE:1.6 yamt-pagecache-base7:1.6 netbsd-5-2-RELEASE:1.1.2.3 netbsd-5-2-RC1:1.1.2.3 matt-nb6-plus-nbase:1.6 yamt-pagecache-base6:1.6 netbsd-6-0:1.6.0.14 netbsd-6-0-RELEASE:1.6 netbsd-6-0-RC2:1.6 tls-maxphys:1.6.0.12 tls-maxphys-base:1.6 matt-nb6-plus:1.6.0.10 matt-nb6-plus-base:1.6 netbsd-6-0-RC1:1.6 yamt-pagecache-base5:1.6 yamt-pagecache-base4:1.6 netbsd-6:1.6.0.8 netbsd-6-base:1.6 netbsd-5-1-2-RELEASE:1.1.2.2 netbsd-5-1-1-RELEASE:1.1.2.2 yamt-pagecache-base3:1.6 yamt-pagecache-base2:1.6 yamt-pagecache:1.6.0.6 yamt-pagecache-base:1.6 cherry-xenmp:1.6.0.4 cherry-xenmp-base:1.6 bouyer-quota2-nbase:1.6 bouyer-quota2:1.6.0.2 bouyer-quota2-base:1.6 matt-mips64-premerge-20101231:1.4 matt-nb5-mips64-premerge-20101231:1.2.2.2 matt-nb5-pq3:1.1.2.2.0.4 matt-nb5-pq3-base:1.1.2.2 netbsd-5-1:1.1.2.2.0.2 netbsd-5-1-RELEASE:1.1.2.2 netbsd-5-1-RC4:1.1.2.2 matt-nb5-mips64-k15:1.2.2.2 netbsd-5-1-RC3:1.1.2.2 netbsd-5-1-RC2:1.1.2.2 netbsd-5-1-RC1:1.1.2.2 matt-nb5-mips64:1.2.0.2 matt-premerge-20091211:1.2 netbsd-5:1.1.0.2; locks; strict; comment @# @; 1.11 date 2022.11.12.02.03.08; author mrg; state Exp; branches; next 1.10; commitid sLEOrsq31Dti3m1E; 1.10 date 2022.01.14.19.44.04; author macallan; state Exp; branches; next 1.9; commitid v7k0jYxGE9O0DDoD; 1.9 date 2019.05.16.01.22.36; author christos; state Exp; branches; next 1.8; commitid shGFaxU6EdsgQmnB; 1.8 date 2016.01.05.13.07.47; author christos; state Exp; branches 1.8.16.1; next 1.7; commitid Vm5Z50yPA0D3bKPy; 1.7 date 2015.06.24.22.20.25; author matt; state Exp; branches; next 1.6; commitid DfokHb46UCq7vJqy; 1.6 date 2011.01.14.16.04.49; author jmcneill; state Exp; branches; next 1.5; 1.5 date 2011.01.12.19.04.19; author jmcneill; state Exp; branches; next 1.4; 1.4 date 2010.06.03.09.42.40; author veego; state Exp; branches; next 1.3; 1.3 date 2010.05.22.10.31.20; author mrg; state Exp; branches; next 1.2; 1.2 date 2009.11.09.07.24.27; author mrg; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2009.06.11.01.52.03; author mrg; state Exp; branches 1.1.2.1; next ; 1.8.16.1 date 2019.06.10.22.02.42; author christos; state Exp; branches; next ; commitid jtc8rnCzWiEEHGqB; 1.2.2.1 date 2009.11.09.07.24.27; author matt; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2010.04.21.05.24.37; author matt; state Exp; branches; next ; 1.1.2.1 date 2009.06.11.01.52.03; author snj; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2009.09.17.04.24.32; author snj; state Exp; branches; next 1.1.2.3; 1.1.2.3 date 2011.03.07.18.46.08; author riz; state Exp; branches; next ; desc @@ 1.11 log @updates for libpciaccess 0.17. @ text @# $NetBSD: Makefile,v 1.10 2022/01/14 19:44:04 macallan Exp $ .include LIB= pciaccess .PATH: ${X11SRCDIR.${LIB}}/src .PATH: ${X11SRCDIR.${LIB}}/include SRCS= common_bridge.c \ common_io.c \ common_iterator.c \ common_init.c \ common_interface.c \ common_capability.c \ common_device_name.c \ common_map.c \ common_vgaarb_stub.c \ netbsd_pci.c CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include -DHAVE_ZLIB \ -DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H \ -DPCIIDS_PATH=\"${X11ROOTDIR}/share/pciids\" COPTS.common_init.c= -Wno-error INCS= pciaccess.h INCSDIR=${X11INCDIR} PKGDIST= ${LIB} PKGCONFIG_SED_FLAGS= \ -e "s,@@PCIACCESS_LIBS@@,-lpci -lz," \ LIBDPLIBS+= pci ${NETBSDSRCDIR}/lib/libpci \ z ${NETBSDSRCDIR}/lib/libz # do not blindly enable memory and IO access on macppc .if ${MACHINE} == "macppc" CPPFLAGS+= -DAVOID_DEVICE_ENABLE .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" CPPFLAGS+= -DHAVE_MTRR LIBDPLIBS+= ${XORG_MACHINE_ARCH:U${MACHINE_ARCH}} ${NETBSDSRCDIR}/lib/libarch .endif .include .include @ 1.10 log @don't blindly enable memory and IO access on macppc @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2019/05/16 01:22:36 christos Exp $ d30 2 @ 1.9 log @Fix MKCOMPATX11 build @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2016/01/05 13:07:47 christos Exp $ d34 5 @ 1.8 log @- Change LDADD/DPADD in library dependencies to LIBDPLIBS - Fix some LDADD abuse and remove useless dependencies - include in the right place where appropriate From Rin Okuyama @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2015/06/24 22:20:25 matt Exp $ a8 2 XORG_MACHINE_ARCH?=${MACHINE_ARCH} d34 1 a34 1 .if ${XORG_MACHINE_ARCH} == "i386" || ${XORG_MACHINE_ARCH} == "x86_64" d36 1 a36 8 .endif .if ${XORG_MACHINE_ARCH} == "i386" LIBDPLIBS+= i386 ${NETBSDSRCDIR}/lib/libarch .endif .if ${XORG_MACHINE_ARCH} == "x86_64" LIBDPLIBS+= x86_64 ${NETBSDSRCDIR}/lib/libarch @ 1.8.16.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2019/05/16 01:22:36 christos Exp $ d9 2 d36 1 a36 1 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" d38 8 a45 1 LIBDPLIBS+= ${XORG_MACHINE_ARCH:U${MACHINE_ARCH}} ${NETBSDSRCDIR}/lib/libarch @ 1.7 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.6 2011/01/14 16:04:49 jmcneill Exp $ d33 2 a34 2 LDADD+= -lpci -lz DPADD+= ${LIBPCI} ${LIBZ} d41 1 a41 2 LDADD+= -li386 DPADD+= ${LIBI386} d45 1 a45 2 LDADD+= -lx86_64 DPADD+= ${LIBX86_64} @ 1.6 log @only define HAVE_MTRR on x86 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2011/01/12 19:04:19 jmcneill Exp $ d9 2 d36 1 a36 1 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" d40 1 a40 1 .if ${MACHINE_ARCH} == "i386" d45 1 a45 1 .if ${MACHINE_ARCH} == "x86_64" @ 1.5 log @HAVE_MMTR -> HAVE_MTRR @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2010/06/03 09:42:40 veego Exp $ d20 1 a20 2 CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include \ -DHAVE_MTRR -DHAVE_ZLIB \ d34 4 @ 1.4 log @Link against libz to fix a hidden dependency @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2010/05/22 10:31:20 mrg Exp $ d21 1 a21 1 -DHAVE_MMTR -DHAVE_ZLIB \ @ 1.3 log @add common_io.c and bump the minor. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2009/11/09 07:24:27 mrg Exp $ d32 2 a33 2 LDADD+= -lpci DPADD+= ${LIBPCI} @ 1.2 log @update for libpciaccess 0.10.9 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2009/06/11 01:52:03 mrg Exp $ d10 1 @ 1.2.2.1 log @file Makefile was added on branch matt-nb5-mips64 on 2010-04-21 05:24:36 +0000 @ text @d1 45 @ 1.2.2.2 log @sync to netbsd-5 @ text @a0 44 # $NetBSD: Makefile,v 1.1.2.2 2009/09/17 04:24:32 snj Exp $ .include LIB= pciaccess .PATH: ${X11SRCDIR.${LIB}}/src .PATH: ${X11SRCDIR.${LIB}}/include SRCS= common_bridge.c \ common_iterator.c \ common_init.c \ common_interface.c \ common_capability.c \ common_device_name.c \ common_map.c \ netbsd_pci.c CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include \ -DHAVE_MMTR -DHAVE_ZLIB \ -DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H \ -DPCIIDS_PATH=\"${X11ROOTDIR}/share/pciids\" COPTS.common_init.c= -Wno-error INCS= pciaccess.h INCSDIR=${X11INCDIR} PKGDIST= ${LIB} LDADD+= -lpci DPADD+= ${LIBPCI} .if ${MACHINE_ARCH} == "i386" LDADD+= -li386 DPADD+= ${LIBI386} .endif .if ${MACHINE_ARCH} == "x86_64" LDADD+= -lx86_64 DPADD+= ${LIBX86_64} .endif .include .include @ 1.1 log @reachover build for libpciaccess. @ text @d1 1 a1 1 # $NetBSD$ d16 1 @ 1.1.2.1 log @file Makefile was added on branch netbsd-5 on 2009-09-17 04:24:32 +0000 @ text @d1 44 @ 1.1.2.2 log @Apply patch (requested by mrg in ticket #958): Sync X.Org reachover build framework and setlists with the new X.Org. @ text @a0 44 # $NetBSD: Makefile,v 1.1 2009/06/11 01:52:03 mrg Exp $ .include LIB= pciaccess .PATH: ${X11SRCDIR.${LIB}}/src .PATH: ${X11SRCDIR.${LIB}}/include SRCS= common_bridge.c \ common_iterator.c \ common_init.c \ common_interface.c \ common_capability.c \ common_device_name.c \ common_map.c \ netbsd_pci.c CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include \ -DHAVE_MMTR -DHAVE_ZLIB \ -DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H \ -DPCIIDS_PATH=\"${X11ROOTDIR}/share/pciids\" COPTS.common_init.c= -Wno-error INCS= pciaccess.h INCSDIR=${X11INCDIR} PKGDIST= ${LIB} LDADD+= -lpci DPADD+= ${LIBPCI} .if ${MACHINE_ARCH} == "i386" LDADD+= -li386 DPADD+= ${LIBI386} .endif .if ${MACHINE_ARCH} == "x86_64" LDADD+= -lx86_64 DPADD+= ${LIBX86_64} .endif .include .include @ 1.1.2.3 log @Pull up following revision(s) (requested by jmcneill in ticket #1557): xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c: revision 1.8 external/mit/xorg/lib/libpciaccess/Makefile: revision 1.5 external/mit/xorg/lib/libpciaccess/Makefile: revision 1.6 Fix compilation with HAVE_MTRR HAVE_MMTR -> HAVE_MTRR only define HAVE_MTRR on x86 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1.2.2 2009/09/17 04:24:32 snj Exp $ d18 2 a19 1 CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include -DHAVE_ZLIB \ a32 4 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" CPPFLAGS+= -DHAVE_MTRR .endif @