Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Support building the xorg X11 libraries under MKCOMPAT.
details: https://anonhg.NetBSD.org/src/rev/cb2535cbaf49
branches: trunk
changeset: 339068:cb2535cbaf49
user: matt <matt%NetBSD.org@localhost>
date: Wed Jun 24 22:20:24 2015 +0000
description:
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}
diffstat:
Makefile | 5 +-
compat/amd64/i386/bsd.i386.mk | 3 +-
compat/arm/eabi/bsd.eabi.mk | 3 +-
compat/arm/eabihf/bsd.eabihf.mk | 3 +-
compat/arm/oabi/bsd.oabi.mk | 3 +-
compat/compatsubdir.mk | 7 +-
compat/mips64/o32/bsd.o32.mk | 3 +-
compat/powerpc64/powerpc/bsd.powerpc.mk | 3 +-
compat/riscv64/rv32/bsd.rv32.mk | 3 +-
compat/sparc64/sparc/bsd.sparc.mk | 3 +-
distrib/sets/lists/xbase/md.amd64 | 32 +-
distrib/sets/lists/xbase/mi | 6 +-
distrib/sets/lists/xbase/shl.mi | 512 ++++++++++----------
distrib/sets/lists/xcomp/md.amd64 | 32 +-
distrib/sets/lists/xcomp/mi | 378 +++++++-------
distrib/sets/lists/xcomp/shl.mi | 172 +++---
distrib/sets/lists/xdebug/md.amd64 | 22 +-
distrib/sets/lists/xdebug/shl.mi | 176 +++---
etc/mtree/Makefile | 12 +-
etc/mtree/NetBSD.dist.xcompat.in | 3 +
external/mit/xorg/lib/Makefile | 15 +-
external/mit/xorg/lib/libpciaccess/Makefile | 10 +-
external/mit/xorg/tools/Makefile | 7 +-
external/mit/xorg/tools/makekeys/Makefile | 9 +-
external/mit/xorg/tools/makekeys/Makefile.makekeys | 12 +-
external/mit/xorg/tools/makestrs/Makefile | 10 +-
external/mit/xorg/tools/makestrs/Makefile.makestrs | 8 +-
share/mk/bsd.own.mk | 8 +-
share/mk/bsd.x11.mk | 4 +-
tools/Makefile | 5 +-
tools/makekeys/Makefile | 17 +
tools/makestrs/Makefile | 6 +
32 files changed, 776 insertions(+), 716 deletions(-)
diffs (truncated from 1969 to 300 lines):
diff -r eb72a589b318 -r cb2535cbaf49 Makefile
--- a/Makefile Wed Jun 24 19:46:30 2015 +0000
+++ b/Makefile Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.313 2015/05/03 15:13:13 martin Exp $
+# $NetBSD: Makefile,v 1.314 2015/06/24 22:20:24 matt Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -485,6 +485,9 @@
.if ${X11FLAVOUR} == "Xorg"
${MAKEDIRTARGET} external/mit/xorg/tools all
${MAKEDIRTARGET} external/mit/xorg/lib build_install
+.if ${MKCOMPAT} != "no"
+ ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
+.endif
.else
${MAKEDIRTARGET} x11 build
.endif
diff -r eb72a589b318 -r cb2535cbaf49 compat/amd64/i386/bsd.i386.mk
--- a/compat/amd64/i386/bsd.i386.mk Wed Jun 24 19:46:30 2015 +0000
+++ b/compat/amd64/i386/bsd.i386.mk Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386.mk,v 1.5 2011/09/23 06:44:36 mrg Exp $
+# $NetBSD: bsd.i386.mk,v 1.6 2015/06/24 22:20:24 matt Exp $
LD+= -m elf_i386
MLIBDIR= i386
@@ -11,5 +11,6 @@
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
GOMP_MACHINE_ARCH= ${MLIBDIR}
+XORG_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
diff -r eb72a589b318 -r cb2535cbaf49 compat/arm/eabi/bsd.eabi.mk
--- a/compat/arm/eabi/bsd.eabi.mk Wed Jun 24 19:46:30 2015 +0000
+++ b/compat/arm/eabi/bsd.eabi.mk Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.eabi.mk,v 1.3 2014/08/10 23:26:25 matt Exp $
+# $NetBSD: bsd.eabi.mk,v 1.4 2015/06/24 22:20:24 matt Exp $
.if !defined(MLIBDIR)
@@ -41,6 +41,7 @@
BFD_MACHINE_ARCH= earm
CSU_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
COMMON_MACHINE_CPU= arm
COMPAT_MACHINE_CPU= arm
diff -r eb72a589b318 -r cb2535cbaf49 compat/arm/eabihf/bsd.eabihf.mk
--- a/compat/arm/eabihf/bsd.eabihf.mk Wed Jun 24 19:46:30 2015 +0000
+++ b/compat/arm/eabihf/bsd.eabihf.mk Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.eabihf.mk,v 1.2 2014/09/10 22:43:36 matt Exp $
+# $NetBSD: bsd.eabihf.mk,v 1.3 2015/06/24 22:20:24 matt Exp $
.if !defined(MLIBDIR)
@@ -41,6 +41,7 @@
BFD_MACHINE_ARCH= earmhf
CSU_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
COMMON_MACHINE_CPU= arm
COMPAT_MACHINE_CPU= arm
diff -r eb72a589b318 -r cb2535cbaf49 compat/arm/oabi/bsd.oabi.mk
--- a/compat/arm/oabi/bsd.oabi.mk Wed Jun 24 19:46:30 2015 +0000
+++ b/compat/arm/oabi/bsd.oabi.mk Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.oabi.mk,v 1.3 2014/08/10 23:26:26 matt Exp $
+# $NetBSD: bsd.oabi.mk,v 1.4 2015/06/24 22:20:24 matt Exp $
.if !defined(MLIBDIR)
MLIBDIR= oabi
@@ -31,6 +31,7 @@
BFD_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
CSU_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
COMMON_MACHINE_CPU= arm
COMPAT_MACHINE_CPU= arm
diff -r eb72a589b318 -r cb2535cbaf49 compat/compatsubdir.mk
--- a/compat/compatsubdir.mk Wed Jun 24 19:46:30 2015 +0000
+++ b/compat/compatsubdir.mk Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.10 2015/06/22 00:11:33 matt Exp $
+# $NetBSD: compatsubdir.mk,v 1.11 2015/06/24 22:20:24 matt Exp $
# Build netbsd libraries.
@@ -30,7 +30,10 @@
SUBDIR+= ../../../tests/share # because MKSHARE=no above
SUBDIR+= ../../../external/bsd/atf/tests
.endif
-.endif
+.if ${MKX11} != no && ${X11FLAVOUR} == "Xorg" && make(obj)
+SUBDIR+= ../../../external/mit/xorg/lib
+.endif # } MKX11
+.endif # } BOOTSTRAP_SUBDIRS
.include <bsd.subdir.mk>
diff -r eb72a589b318 -r cb2535cbaf49 compat/mips64/o32/bsd.o32.mk
--- a/compat/mips64/o32/bsd.o32.mk Wed Jun 24 19:46:30 2015 +0000
+++ b/compat/mips64/o32/bsd.o32.mk Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.12 2015/06/22 00:09:39 matt Exp $
+# $NetBSD: bsd.o32.mk,v 1.13 2015/06/24 22:20:25 matt Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
@@ -10,6 +10,7 @@
LIBGCC_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
GOMP_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
+XORG_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
COPTS+= -mabi=32 -march=mips3
CPUFLAGS+= -mabi=32 -march=mips3
diff -r eb72a589b318 -r cb2535cbaf49 compat/powerpc64/powerpc/bsd.powerpc.mk
--- a/compat/powerpc64/powerpc/bsd.powerpc.mk Wed Jun 24 19:46:30 2015 +0000
+++ b/compat/powerpc64/powerpc/bsd.powerpc.mk Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.powerpc.mk,v 1.3 2014/08/23 02:20:55 matt Exp $
+# $NetBSD: bsd.powerpc.mk,v 1.4 2015/06/24 22:20:25 matt Exp $
LD+= -m elf32ppc_nbsd
.if empty(LDFLAGS:M*elf32ppc_nbsd*)
@@ -15,6 +15,7 @@
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_ARCH= ${MLIBDIR}
GOMP_MACHINE_ARCH= ${MLIBDIR}
+XORG_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
.endif
diff -r eb72a589b318 -r cb2535cbaf49 compat/riscv64/rv32/bsd.rv32.mk
--- a/compat/riscv64/rv32/bsd.rv32.mk Wed Jun 24 19:46:30 2015 +0000
+++ b/compat/riscv64/rv32/bsd.rv32.mk Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.rv32.mk,v 1.1 2014/09/19 17:36:24 matt Exp $
+# $NetBSD: bsd.rv32.mk,v 1.2 2015/06/24 22:20:25 matt Exp $
.if empty(LD:M-m)
@@ -16,6 +16,7 @@
CRYPTO_MACHINE_CPU= riscv32
LDELFSO_MACHINE_CPU= riscv32
GOMP_MACHINE_ARCH= riscv32
+XORG_MACHINE_ARCH= riscv32
.include "${.PARSEDIR}/../../m32.mk"
.endif
diff -r eb72a589b318 -r cb2535cbaf49 compat/sparc64/sparc/bsd.sparc.mk
--- a/compat/sparc64/sparc/bsd.sparc.mk Wed Jun 24 19:46:30 2015 +0000
+++ b/compat/sparc64/sparc/bsd.sparc.mk Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sparc.mk,v 1.5 2011/09/23 06:44:37 mrg Exp $
+# $NetBSD: bsd.sparc.mk,v 1.6 2015/06/24 22:20:25 matt Exp $
LD+= -m elf32_sparc
MLIBDIR= sparc
@@ -11,5 +11,6 @@
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
GOMP_MACHINE_ARCH= ${MLIBDIR}
+XORG_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
diff -r eb72a589b318 -r cb2535cbaf49 distrib/sets/lists/xbase/md.amd64
--- a/distrib/sets/lists/xbase/md.amd64 Wed Jun 24 19:46:30 2015 +0000
+++ b/distrib/sets/lists/xbase/md.amd64 Wed Jun 24 22:20:24 2015 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: md.amd64,v 1.11 2013/08/11 22:29:03 joerg Exp $
-./usr/X11R7/lib/libI810XvMC.so -unknown- xorg
-./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg
-./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libIntelXvMC.so -unknown- xorg
-./usr/X11R7/lib/libIntelXvMC.so.1 -unknown- xorg
-./usr/X11R7/lib/libIntelXvMC.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg
-./usr/X11R7/lib/libchromeXvMC.so.1 -unknown- xorg
-./usr/X11R7/lib/libchromeXvMC.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libchromeXvMCPro.so -unknown- xorg
-./usr/X11R7/lib/libchromeXvMCPro.so.1 -unknown- xorg
-./usr/X11R7/lib/libchromeXvMCPro.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libdrm_intel.so -unknown- xorg
-./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg
-./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg
+# $NetBSD: md.amd64,v 1.12 2015/06/24 22:20:25 matt Exp $
+./usr/X11R7/lib/libI810XvMC.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libIntelXvMC.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libIntelXvMC.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libIntelXvMC.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMC.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMC.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_intel.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg,compatfile
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
diff -r eb72a589b318 -r cb2535cbaf49 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Wed Jun 24 19:46:30 2015 +0000
+++ b/distrib/sets/lists/xbase/mi Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.124 2014/07/12 19:46:22 nakayama Exp $
+# $NetBSD: mi,v 1.125 2015/06/24 22:20:25 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1533,7 +1533,7 @@
./usr/X11R7/include/pixman-1 base-x11-root xorg
./usr/X11R7/include/xcb base-x11-root xorg
./usr/X11R7/include/xorg base-x11-root xorg
-./usr/X11R7/lib base-x11-root xorg
+./usr/X11R7/lib base-x11-root xorg,compatdir
./usr/X11R7/lib/X11 base-x11-root xorg
./usr/X11R7/lib/X11/XErrorDB -unknown- xorg
./usr/X11R7/lib/X11/XKeysymDB -unknown- xorg
@@ -2936,7 +2936,7 @@
./usr/libdata/debug/usr/X11R6/libexec base-sys-usr x11
./usr/libdata/debug/usr/X11R7 base-sys-usr xorg
./usr/libdata/debug/usr/X11R7/bin base-sys-usr xorg
-./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg
+./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,compatdir
./usr/libdata/debug/usr/X11R7/lib/X11 base-sys-usr xorg
./usr/libdata/debug/usr/X11R7/lib/X11/locale base-sys-usr xorg
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib base-sys-usr xorg
diff -r eb72a589b318 -r cb2535cbaf49 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Wed Jun 24 19:46:30 2015 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Wed Jun 24 22:20:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.61 2015/05/04 23:51:25 mrg Exp $
+# $NetBSD: shl.mi,v 1.62 2015/06/24 22:20:25 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -165,282 +165,282 @@
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2 -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libFS.so -unknown- xorg
-./usr/X11R7/lib/libFS.so.7 -unknown- xorg
-./usr/X11R7/lib/libFS.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libGL.so -unknown- xorg
-./usr/X11R7/lib/libGL.so.2 -unknown- xorg
-./usr/X11R7/lib/libGL.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libGLU.so -unknown- xorg
-./usr/X11R7/lib/libGLU.so.2 -unknown- xorg
-./usr/X11R7/lib/libGLU.so.2.1 -unknown- xorg
-./usr/X11R7/lib/libGLw.so -unknown- xorg
-./usr/X11R7/lib/libGLw.so.2 -unknown- xorg
-./usr/X11R7/lib/libGLw.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libICE.so -unknown- xorg
-./usr/X11R7/lib/libICE.so.7 -unknown- xorg
-./usr/X11R7/lib/libICE.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libglapi.so -unknown- xorg
-./usr/X11R7/lib/libglapi.so.0 -unknown- xorg
-./usr/X11R7/lib/libglapi.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libFS.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libFS.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libFS.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGL.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libGL.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGL.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLU.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLU.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLU.so.2.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLw.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLw.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLw.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libICE.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libICE.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libICE.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libglapi.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libglapi.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libglapi.so.0.0 -unknown- xorg,compatfile
./usr/X11R7/lib/libOSMesa.so -unknown- obsolete
./usr/X11R7/lib/libOSMesa.so.7 -unknown- obsolete
./usr/X11R7/lib/libOSMesa.so.7.0 -unknown- obsolete
-./usr/X11R7/lib/libSM.so -unknown- xorg
-./usr/X11R7/lib/libSM.so.7 -unknown- xorg
-./usr/X11R7/lib/libSM.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libX11-xcb.so -unknown- xorg
-./usr/X11R7/lib/libX11-xcb.so.1 -unknown- xorg
-./usr/X11R7/lib/libX11-xcb.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libX11.so -unknown- xorg
-./usr/X11R7/lib/libX11.so.7 -unknown- xorg
-./usr/X11R7/lib/libX11.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXRes.so -unknown- xorg
Home |
Main Index |
Thread Index |
Old Index