CVS commit: src/compat/arm/oabi
Module Name:src Committed By: mrg Date: Fri Jun 18 06:34:00 UTC 2021 Removed Files: src/compat/arm/oabi: Makefile bsd.oabi.mk Log Message: remove obsolete files. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/compat/arm/oabi/Makefile cvs rdiff -u -r1.5 -r0 src/compat/arm/oabi/bsd.oabi.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/compat
Module Name:src Committed By: simonb Date: Mon May 31 02:10:37 UTC 2021 Modified Files: src/compat: exec.mk Log Message: MIPS n64 dynamic binaries have worked for a while now, remove -static for these. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/compat/exec.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/compat/exec.mk diff -u src/compat/exec.mk:1.5 src/compat/exec.mk:1.6 --- src/compat/exec.mk:1.5 Tue Jan 5 11:08:00 2021 +++ src/compat/exec.mk Mon May 31 02:10:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: exec.mk,v 1.5 2021/01/05 11:08:00 simonb Exp $ +# $NetBSD: exec.mk,v 1.6 2021/05/31 02:10:37 simonb Exp $ # this makefile fragment can be included to modify the default # ABI a program is compiled with. this is designed to be used @@ -34,8 +34,6 @@ # XXX -pie makes n64 crash NOPIE=1 -# XXX interesting dynamic binaries crash (hello.c works.) -LDSTATIC=-static . include
CVS commit: src/compat/mips64
Module Name:src
Committed By: christos
Date: Sun Apr 25 18:44:05 UTC 2021
Modified Files:
src/compat/mips64/n32: bsd.n32.mk
src/compat/mips64/o32: bsd.o32.mk
Log Message:
define BFD_MACHINE_ARCH. This worked by accident before since the default
64 bit target was 32 bits.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/mips64/n32/bsd.n32.mk
cvs rdiff -u -r1.15 -r1.16 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/n32/bsd.n32.mk
diff -u src/compat/mips64/n32/bsd.n32.mk:1.1 src/compat/mips64/n32/bsd.n32.mk:1.2
--- src/compat/mips64/n32/bsd.n32.mk:1.1 Sun Apr 25 11:18:23 2021
+++ src/compat/mips64/n32/bsd.n32.mk Sun Apr 25 14:44:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.n32.mk,v 1.1 2021/04/25 15:18:23 christos Exp $
+# $NetBSD: bsd.n32.mk,v 1.2 2021/04/25 18:44:04 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
LD+= -m elf32btsmipn32
@@ -12,6 +12,7 @@ LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/mips
LIBGCC_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
XORG_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+BFD_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
COPTS+= -mabi=n32
CPUFLAGS+= -mabi=n32
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.15 src/compat/mips64/o32/bsd.o32.mk:1.16
--- src/compat/mips64/o32/bsd.o32.mk:1.15 Sun Apr 25 11:18:23 2021
+++ src/compat/mips64/o32/bsd.o32.mk Sun Apr 25 14:44:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.15 2021/04/25 15:18:23 christos Exp $
+# $NetBSD: bsd.o32.mk,v 1.16 2021/04/25 18:44:04 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
LD+= -m elf32btsmip
@@ -12,6 +12,7 @@ LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/mips
LIBGCC_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
XORG_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+BFD_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
COPTS+= -mabi=32 -march=mips3
CPUFLAGS+= -mabi=32 -march=mips3
CVS commit: src/compat
Module Name:src
Committed By: christos
Date: Sun Apr 25 15:18:23 UTC 2021
Modified Files:
src/compat: archdirs.mk
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
Added Files:
src/compat/mips64/n32: Makefile bsd.n32.mk
Log Message:
mips64 -> o32 64
mipsn64 -> o32 n32
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/compat/archdirs.mk
cvs rdiff -u -r1.12 -r1.13 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r0 -r1.1 src/compat/mips64/n32/Makefile \
src/compat/mips64/n32/bsd.n32.mk
cvs rdiff -u -r1.14 -r1.15 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.12 src/compat/archdirs.mk:1.13
--- src/compat/archdirs.mk:1.12 Thu Jun 13 17:17:54 2019
+++ src/compat/archdirs.mk Sun Apr 25 11:18:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.12 2019/06/13 21:17:54 christos Exp $
+# $NetBSD: archdirs.mk,v 1.13 2021/04/25 15:18:23 christos Exp $
# list of subdirs used per-platform
@@ -14,11 +14,16 @@ ARCHDIR_SUBDIR+= amd64/i386
ARCHDIR_SUBDIR+= arm/oabi
.endif
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
+.if !empty(MACHINE_ARCH:Mmips64*)
ARCHDIR_SUBDIR+= mips64/64
ARCHDIR_SUBDIR+= mips64/o32
.endif
+.if !empty(MACHINE_ARCH:Mmipsn64*)
+ARCHDIR_SUBDIR+= mips64/n32
+ARCHDIR_SUBDIR+= mips64/o32
+.endif
+
.if ${MACHINE_ARCH} == "powerpc64"
ARCHDIR_SUBDIR+= powerpc64/powerpc
.endif
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.12 src/compat/mips64/64/bsd.64.mk:1.13
--- src/compat/mips64/64/bsd.64.mk:1.12 Tue Feb 6 05:00:00 2018
+++ src/compat/mips64/64/bsd.64.mk Sun Apr 25 11:18:23 2021
@@ -1,6 +1,6 @@
-# $NetBSD: bsd.64.mk,v 1.12 2018/02/06 10:00:00 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.13 2021/04/25 15:18:23 christos Exp $
-.if ${MACHINE_ARCH} == "mips64eb"
+.if !empty(MACHINE_ARCH:M*eb)
LD+= -m elf64btsmip
.else
LD+= -m elf64ltsmip
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.14 src/compat/mips64/o32/bsd.o32.mk:1.15
--- src/compat/mips64/o32/bsd.o32.mk:1.14 Fri Oct 7 15:10:37 2016
+++ src/compat/mips64/o32/bsd.o32.mk Sun Apr 25 11:18:23 2021
@@ -1,6 +1,6 @@
-# $NetBSD: bsd.o32.mk,v 1.14 2016/10/07 19:10:37 christos Exp $
+# $NetBSD: bsd.o32.mk,v 1.15 2021/04/25 15:18:23 christos Exp $
-.if ${MACHINE_ARCH} == "mips64eb"
+.if !empty(MACHINE_ARCH:M*eb)
LD+= -m elf32btsmip
.else
LD+= -m elf32ltsmip
@@ -8,10 +8,10 @@ LD+= -m elf32ltsmip
.ifndef MLIBDIR
MLIBDIR= o32
-LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
-LIBGCC_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
-GOMP_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
-XORG_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
+LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/mipsn/mips/:S/64//}
+LIBGCC_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+GOMP_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
COPTS+= -mabi=32 -march=mips3
CPUFLAGS+= -mabi=32 -march=mips3
Added files:
Index: src/compat/mips64/n32/Makefile
diff -u /dev/null src/compat/mips64/n32/Makefile:1.1
--- /dev/null Sun Apr 25 11:18:23 2021
+++ src/compat/mips64/n32/Makefile Sun Apr 25 11:18:23 2021
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2021/04/25 15:18:23 christos Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.n32.mk
+
+.include "../../compatsubdir.mk"
Index: src/compat/mips64/n32/bsd.n32.mk
diff -u /dev/null src/compat/mips64/n32/bsd.n32.mk:1.1
--- /dev/null Sun Apr 25 11:18:23 2021
+++ src/compat/mips64/n32/bsd.n32.mk Sun Apr 25 11:18:23 2021
@@ -0,0 +1,23 @@
+# $NetBSD: bsd.n32.mk,v 1.1 2021/04/25 15:18:23 christos Exp $
+
+.if !empty(MACHINE_ARCH:M*eb)
+LD+= -m elf32btsmipn32
+.else
+LD+= -m elf32ltsmipn32
+.endif
+.ifndef MLIBDIR
+MLIBDIR= n32
+
+LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/mipsn/mips/:S/64//}
+LIBGCC_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+GOMP_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+
+COPTS+= -mabi=n32
+CPUFLAGS+= -mabi=n32
+LDADD+= -mabi=n32
+LDFLAGS+= -mabi=n32
+MKDEPFLAGS+= -mabi=n32
+.endif
+
+.include "${.PARSEDIR}/../../Makefile.compat"
CVS commit: src/compat
Module Name:src
Committed By: macallan
Date: Thu Sep 20 02:51:21 UTC 2018
Modified Files:
src/compat: exec.mk
Log Message:
don't build kernel grovelling tools as n64 on sgimips - we don't actually have
n64 kernels there. Yet.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/compat/exec.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/exec.mk
diff -u src/compat/exec.mk:1.3 src/compat/exec.mk:1.4
--- src/compat/exec.mk:1.3 Thu Jan 5 21:28:42 2017
+++ src/compat/exec.mk Thu Sep 20 02:51:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: exec.mk,v 1.3 2017/01/05 21:28:42 skrll Exp $
+# $NetBSD: exec.mk,v 1.4 2018/09/20 02:51:21 macallan Exp $
# this makefile fragment can be included to modify the default
# ABI a program is compiled with. this is designed to be used
@@ -27,7 +27,7 @@
# mips64 defaults to 32 bit userland, but with a 64 bit kernel
# most kvm-using tools are happier with 64 bit.
-.if ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.if ${MACHINE_ARCH} == "mips64el" || (${MACHINE_ARCH} == "mips64eb" && ${MACHINE} != "sgimips")
# XXX -pie makes n64 crash
NOPIE=1
CVS commit: src/compat
Module Name:src
Committed By: christos
Date: Mon Jul 16 00:33:00 UTC 2018
Modified Files:
src/compat: archdirs.mk
Log Message:
gcc aarch64 does not have multilib
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/compat/archdirs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.10 src/compat/archdirs.mk:1.11
--- src/compat/archdirs.mk:1.10 Wed May 27 11:35:23 2015
+++ src/compat/archdirs.mk Sun Jul 15 20:33:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.10 2015/05/27 15:35:23 matt Exp $
+# $NetBSD: archdirs.mk,v 1.11 2018/07/16 00:33:00 christos Exp $
# list of subdirs used per-platform
@@ -26,6 +26,7 @@ ARCHDIR_SUBDIR= powerpc64/powerpc
ARCHDIR_SUBDIR= riscv64/rv32
.endif
+.if ${ACTIVE_CC} == "clang"
.if (${MACHINE_ARCH} == "aarch64")
ARCHDIR_SUBDIR+= arm/eabi
ARCHDIR_SUBDIR+= arm/eabihf
@@ -33,3 +34,4 @@ ARCHDIR_SUBDIR+= arm/oabi
.elif (${MACHINE_ARCH} == "aarch64eb")
ARCHDIR_SUBDIR= arm/eabi
.endif
+.endif
CVS commit: src/compat/mips64/64
Module Name:src
Committed By: mrg
Date: Tue Feb 6 10:00:00 UTC 2018
Modified Files:
src/compat/mips64/64: bsd.64.mk
Log Message:
fix a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/compat/mips64/64/bsd.64.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.11 src/compat/mips64/64/bsd.64.mk:1.12
--- src/compat/mips64/64/bsd.64.mk:1.11 Mon Jun 22 00:09:39 2015
+++ src/compat/mips64/64/bsd.64.mk Tue Feb 6 10:00:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.64.mk,v 1.11 2015/06/22 00:09:39 matt Exp $
+# $NetBSD: bsd.64.mk,v 1.12 2018/02/06 10:00:00 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
@@ -8,9 +8,7 @@ LD+= -m elf64ltsmip
.ifndef MLIBDIR
MLIBDIR= 64
-# XXX
-# GCC 4.5 libgomp wants a different omp.h installed for the 64 bit
-# version of it, and we don't have a way of doing that yet.
+# GCC 5/6 libgomp for n64 needs files we don't generate yet.
NO_LIBGOMP= 1
COPTS+= -mabi=64
CVS commit: src/compat
Module Name:src
Committed By: skrll
Date: Thu Jan 5 21:28:42 UTC 2017
Modified Files:
src/compat: exec.mk
Log Message:
Don't mix abis in any CRUNCHEDPROG
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/exec.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/exec.mk
diff -u src/compat/exec.mk:1.2 src/compat/exec.mk:1.3
--- src/compat/exec.mk:1.2 Thu Dec 29 23:42:38 2016
+++ src/compat/exec.mk Thu Jan 5 21:28:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: exec.mk,v 1.2 2016/12/29 23:42:38 mrg Exp $
+# $NetBSD: exec.mk,v 1.3 2017/01/05 21:28:42 skrll Exp $
# this makefile fragment can be included to modify the default
# ABI a program is compiled with. this is designed to be used
@@ -36,7 +36,7 @@ LDSTATIC=-static
. include
-. if ${MKCOMPAT} != "no" && !defined(RESCUEDIR)
+. if ${MKCOMPAT} != "no" && !defined(CRUNCHEDPROG)
. include "${.PARSEDIR}/mips64/64/bsd.64.mk"
. endif # ${MKCOMPAT} != "no"
CVS commit: src/compat/amd64/i386
Module Name:src
Committed By: christos
Date: Sat Oct 22 20:33:51 UTC 2016
Modified Files:
src/compat/amd64/i386: bsd.i386.mk
Log Message:
add LIBGCC_MACHINE_ARCH
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/amd64/i386/bsd.i386.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/amd64/i386/bsd.i386.mk
diff -u src/compat/amd64/i386/bsd.i386.mk:1.6 src/compat/amd64/i386/bsd.i386.mk:1.7
--- src/compat/amd64/i386/bsd.i386.mk:1.6 Wed Jun 24 18:20:24 2015
+++ src/compat/amd64/i386/bsd.i386.mk Sat Oct 22 16:33:51 2016
@@ -1,7 +1,8 @@
-# $NetBSD: bsd.i386.mk,v 1.6 2015/06/24 22:20:24 matt Exp $
+# $NetBSD: bsd.i386.mk,v 1.7 2016/10/22 20:33:51 christos Exp $
LD+= -m elf_i386
MLIBDIR= i386
+LIBGCC_MACHINE_ARCH= ${MLIBDIR}
LIBC_MACHINE_ARCH= ${MLIBDIR}
COMMON_MACHINE_ARCH= ${MLIBDIR}
KVM_MACHINE_ARCH= ${MLIBDIR}
CVS commit: src/compat/mips64/o32
Module Name:src
Committed By: christos
Date: Fri Oct 7 19:10:37 UTC 2016
Modified Files:
src/compat/mips64/o32: bsd.o32.mk
Log Message:
set LIBC_MACHINE_ARCH otherwise we don't get 'double' intrinsics.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.13 src/compat/mips64/o32/bsd.o32.mk:1.14
--- src/compat/mips64/o32/bsd.o32.mk:1.13 Wed Jun 24 18:20:25 2015
+++ src/compat/mips64/o32/bsd.o32.mk Fri Oct 7 15:10:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.13 2015/06/24 22:20:25 matt Exp $
+# $NetBSD: bsd.o32.mk,v 1.14 2016/10/07 19:10:37 christos Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
@@ -8,9 +8,10 @@ LD+= -m elf32ltsmip
.ifndef MLIBDIR
MLIBDIR= o32
-LIBGCC_MACHINE_ARCH=${MACHINE_ARCH:S/64//}
-GOMP_MACHINE_ARCH=${MACHINE_ARCH:S/64//}
-XORG_MACHINE_ARCH=${MACHINE_ARCH:S/64//}
+LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
+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
CVS commit: src/compat/arm/eabi
Module Name:src Committed By: matt Date: Sun Jul 5 20:19:29 UTC 2015 Modified Files: src/compat/arm/eabi: bsd.eabi.mk Log Message: Make clang happy by adding -mfpu=none to -mfloat-abi=soft To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/compat/arm/eabi/bsd.eabi.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/compat/arm/eabi/bsd.eabi.mk diff -u src/compat/arm/eabi/bsd.eabi.mk:1.4 src/compat/arm/eabi/bsd.eabi.mk:1.5 --- src/compat/arm/eabi/bsd.eabi.mk:1.4 Wed Jun 24 22:20:24 2015 +++ src/compat/arm/eabi/bsd.eabi.mk Sun Jul 5 20:19:29 2015 @@ -1,10 +1,10 @@ -# $NetBSD: bsd.eabi.mk,v 1.4 2015/06/24 22:20:24 matt Exp $ +# $NetBSD: bsd.eabi.mk,v 1.5 2015/07/05 20:19:29 matt Exp $ .if !defined(MLIBDIR) MLIBDIR= eabi -EARM_COMPAT_FLAGS= -mfloat-abi=soft +EARM_COMPAT_FLAGS= -mfloat-abi=soft -mfpu=none EARM_COMPAT_FLAGS+= -mabi=aapcs-linux MKSOFTFLOAT=yes
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Mon Jun 22 00:11:33 UTC 2015
Modified Files:
src/compat: compatsubdir.mk
Log Message:
Add tests/share/mk and external/bsd/atf/tests/atf for MKCOMPATTESTS
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/compat/compatsubdir.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.9 src/compat/compatsubdir.mk:1.10
--- src/compat/compatsubdir.mk:1.9 Fri Jun 19 18:17:49 2015
+++ src/compat/compatsubdir.mk Mon Jun 22 00:11:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.9 2015/06/19 18:17:49 matt Exp $
+# $NetBSD: compatsubdir.mk,v 1.10 2015/06/22 00:11:33 matt Exp $
# Build netbsd libraries.
@@ -27,6 +27,8 @@ 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
.endif
CVS commit: src/compat/mips64
Module Name:src
Committed By: matt
Date: Mon Jun 22 00:09:40 UTC 2015
Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
Log Message:
Reduce the amount that's include protected.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.11 -r1.12 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.10 src/compat/mips64/64/bsd.64.mk:1.11
--- src/compat/mips64/64/bsd.64.mk:1.10 Fri Jun 19 18:17:26 2015
+++ src/compat/mips64/64/bsd.64.mk Mon Jun 22 00:09:39 2015
@@ -1,11 +1,11 @@
-# $NetBSD: bsd.64.mk,v 1.10 2015/06/19 18:17:26 matt Exp $
+# $NetBSD: bsd.64.mk,v 1.11 2015/06/22 00:09:39 matt Exp $
-.ifndef MLIBDIR
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
.else
LD+= -m elf64ltsmip
.endif
+.ifndef MLIBDIR
MLIBDIR= 64
# XXX
@@ -18,6 +18,6 @@ CPUFLAGS+= -mabi=64
LDADD+= -mabi=64
LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
+.endif
.include "${.PARSEDIR}/../../Makefile.compat"
-.endif
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.11 src/compat/mips64/o32/bsd.o32.mk:1.12
--- src/compat/mips64/o32/bsd.o32.mk:1.11 Fri Jun 19 18:17:26 2015
+++ src/compat/mips64/o32/bsd.o32.mk Mon Jun 22 00:09:39 2015
@@ -1,11 +1,11 @@
-# $NetBSD: bsd.o32.mk,v 1.11 2015/06/19 18:17:26 matt Exp $
+# $NetBSD: bsd.o32.mk,v 1.12 2015/06/22 00:09:39 matt Exp $
-.ifndef MLIBDIR
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
.else
LD+= -m elf32ltsmip
.endif
+.ifndef MLIBDIR
MLIBDIR= o32
LIBGCC_MACHINE_ARCH=${MACHINE_ARCH:S/64//}
@@ -16,6 +16,6 @@ CPUFLAGS+= -mabi=32 -march=mips3
LDADD+= -mabi=32 -march=mips3
LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
+.endif
.include "${.PARSEDIR}/../../Makefile.compat"
-.endif
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Fri Jun 19 18:17:49 UTC 2015
Modified Files:
src/compat: compatsubdir.mk
Log Message:
Add support for MKCOMPATTESTS
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/compat/compatsubdir.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.8 src/compat/compatsubdir.mk:1.9
--- src/compat/compatsubdir.mk:1.8 Fri Aug 17 16:22:27 2012
+++ src/compat/compatsubdir.mk Fri Jun 19 18:17:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.8 2012/08/17 16:22:27 joerg Exp $
+# $NetBSD: compatsubdir.mk,v 1.9 2015/06/19 18:17:49 matt Exp $
# Build netbsd libraries.
@@ -25,6 +25,9 @@ SUBDIR= ${BOOTSTRAP_SUBDIRS}
.else
SUBDIR= ../../../lib .WAIT \
../../../libexec/ld.elf_so
+.if ${MKCOMPATTESTS} != "no"
+SUBDIR+= ../../../tests
+.endif
.endif
.include
CVS commit: src/compat/mips64
Module Name:src
Committed By: matt
Date: Fri Jun 19 18:17:26 UTC 2015
Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
Log Message:
Prevent multi inclusion
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.10 -r1.11 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.9 src/compat/mips64/64/bsd.64.mk:1.10
--- src/compat/mips64/64/bsd.64.mk:1.9 Fri Sep 23 06:44:37 2011
+++ src/compat/mips64/64/bsd.64.mk Fri Jun 19 18:17:26 2015
@@ -1,5 +1,6 @@
-# $NetBSD: bsd.64.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.10 2015/06/19 18:17:26 matt Exp $
+.ifndef MLIBDIR
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
.else
@@ -19,3 +20,4 @@ LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
.include "${.PARSEDIR}/../../Makefile.compat"
+.endif
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.10 src/compat/mips64/o32/bsd.o32.mk:1.11
--- src/compat/mips64/o32/bsd.o32.mk:1.10 Thu Feb 14 09:22:18 2013
+++ src/compat/mips64/o32/bsd.o32.mk Fri Jun 19 18:17:26 2015
@@ -1,5 +1,6 @@
-# $NetBSD: bsd.o32.mk,v 1.10 2013/02/14 09:22:18 matt Exp $
+# $NetBSD: bsd.o32.mk,v 1.11 2015/06/19 18:17:26 matt Exp $
+.ifndef MLIBDIR
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
.else
@@ -17,3 +18,4 @@ LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
.include "${.PARSEDIR}/../../Makefile.compat"
+.endif
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Wed May 27 15:35:23 UTC 2015
Modified Files:
src/compat: archdirs.mk
Log Message:
Only support oabi for earm*
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/compat/archdirs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.9 src/compat/archdirs.mk:1.10
--- src/compat/archdirs.mk:1.9 Mon May 25 12:42:26 2015
+++ src/compat/archdirs.mk Wed May 27 15:35:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.9 2015/05/25 12:42:26 martin Exp $
+# $NetBSD: archdirs.mk,v 1.10 2015/05/27 15:35:23 matt Exp $
# list of subdirs used per-platform
@@ -10,12 +10,8 @@ ARCHDIR_SUBDIR= sparc64/sparc
ARCHDIR_SUBDIR= amd64/i386
.endif
-.if !empty(MACHINE_ARCH:Mearmhf*) || !empty(MACHINE_ARCH:Mearmv?hf*)
-ARCHDIR_SUBDIR= arm/oabi arm/eabi
-.elif !empty(MACHINE_ARCH:Mearm*)
+.if !empty(MACHINE_ARCH:Mearm*)
ARCHDIR_SUBDIR= arm/oabi
-.elif !empty(MACHINE_ARCH:Marm)
-ARCHDIR_SUBDIR= arm/eabi
.endif
.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
CVS commit: src/compat
Module Name:src
Committed By: martin
Date: Mon May 25 12:42:26 UTC 2015
Modified Files:
src/compat: archdirs.mk
Log Message:
Fix broken subdir selection after arm architecture explosion
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/compat/archdirs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.8 src/compat/archdirs.mk:1.9
--- src/compat/archdirs.mk:1.8 Fri Sep 19 17:38:46 2014
+++ src/compat/archdirs.mk Mon May 25 12:42:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.8 2014/09/19 17:38:46 matt Exp $
+# $NetBSD: archdirs.mk,v 1.9 2015/05/25 12:42:26 martin Exp $
# list of subdirs used per-platform
@@ -10,16 +10,12 @@ ARCHDIR_SUBDIR= sparc64/sparc
ARCHDIR_SUBDIR= amd64/i386
.endif
-.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
-ARCHDIR_SUBDIR= arm/eabi
-.endif
-
-.if (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb")
-ARCHDIR_SUBDIR= arm/oabi
-.endif
-
-.if (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb")
+.if !empty(MACHINE_ARCH:Mearmhf*) || !empty(MACHINE_ARCH:Mearmv?hf*)
ARCHDIR_SUBDIR= arm/oabi arm/eabi
+.elif !empty(MACHINE_ARCH:Mearm*)
+ARCHDIR_SUBDIR= arm/oabi
+.elif !empty(MACHINE_ARCH:Marm)
+ARCHDIR_SUBDIR= arm/eabi
.endif
.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Fri Sep 19 17:38:46 UTC 2014
Modified Files:
src/compat: archdirs.mk
Log Message:
Add RISC-V support
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/compat/archdirs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.7 src/compat/archdirs.mk:1.8
--- src/compat/archdirs.mk:1.7 Wed Sep 10 22:43:36 2014
+++ src/compat/archdirs.mk Fri Sep 19 17:38:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.7 2014/09/10 22:43:36 matt Exp $
+# $NetBSD: archdirs.mk,v 1.8 2014/09/19 17:38:46 matt Exp $
# list of subdirs used per-platform
@@ -30,6 +30,10 @@ ARCHDIR_SUBDIR= mips64/64 mips64/o32
ARCHDIR_SUBDIR= powerpc64/powerpc
.endif
+.if ${MACHINE_ARCH} == "riscv64"
+ARCHDIR_SUBDIR= riscv64/rv32
+.endif
+
.if (${MACHINE_ARCH} == "aarch64")
ARCHDIR_SUBDIR+= arm/eabi
ARCHDIR_SUBDIR+= arm/eabihf
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Wed Sep 10 22:43:36 UTC 2014
Modified Files:
src/compat: archdirs.mk
src/compat/arm/eabihf: bsd.eabihf.mk
Log Message:
Enable building eabihf compat libraries after fixing bsd.eabihf.mk to use
use the proper variant of arm*--netbsdelf-eabihf
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/archdirs.mk
cvs rdiff -u -r1.1 -r1.2 src/compat/arm/eabihf/bsd.eabihf.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.6 src/compat/archdirs.mk:1.7
--- src/compat/archdirs.mk:1.6 Mon Aug 11 04:33:30 2014
+++ src/compat/archdirs.mk Wed Sep 10 22:43:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.6 2014/08/11 04:33:30 matt Exp $
+# $NetBSD: archdirs.mk,v 1.7 2014/09/10 22:43:36 matt Exp $
# list of subdirs used per-platform
@@ -32,7 +32,7 @@ ARCHDIR_SUBDIR= powerpc64/powerpc
.if (${MACHINE_ARCH} == "aarch64")
ARCHDIR_SUBDIR+= arm/eabi
-#ARCHDIR_SUBDIR+= arm/eabihf
+ARCHDIR_SUBDIR+= arm/eabihf
ARCHDIR_SUBDIR+= arm/oabi
.elif (${MACHINE_ARCH} == "aarch64eb")
ARCHDIR_SUBDIR= arm/eabi
Index: src/compat/arm/eabihf/bsd.eabihf.mk
diff -u src/compat/arm/eabihf/bsd.eabihf.mk:1.1 src/compat/arm/eabihf/bsd.eabihf.mk:1.2
--- src/compat/arm/eabihf/bsd.eabihf.mk:1.1 Sun Aug 10 23:26:25 2014
+++ src/compat/arm/eabihf/bsd.eabihf.mk Wed Sep 10 22:43:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.eabihf.mk,v 1.1 2014/08/10 23:26:25 matt Exp $
+# $NetBSD: bsd.eabihf.mk,v 1.2 2014/09/10 22:43:36 matt Exp $
.if !defined(MLIBDIR)
@@ -9,22 +9,22 @@ EARM_COMPAT_FLAGS+= -mabi=aapcs-linux
MKSOFTFLOAT=no
.if ${MACHINE_ARCH} == "aarch64eb"
-EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-eabihf
EARM_COMPAT_FLAGS+= -mcpu=cortex-a53
ARM_MACHINE_ARCH= earmv7hfeb
LDFLAGS+= -Wl,--be8
ARM_LD= -m armelfb_nbsd_eabihf --be8
.elif ${MACHINE_ARCH} == "aarch64"
-EARM_COMPAT_FLAGS+= -target arm--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target arm--netbsdelf-eabihf
EARM_COMPAT_FLAGS+= -mcpu=cortex-a53
ARM_MACHINE_ARCH= earmv7hf
ARM_LD= -m armelf_nbsd_eabihf
.elif !empty(MACHINE_ARCH:M*eb)
-EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-eabihf
ARM_MACHINE_ARCH= earmhfeb
ARM_LD= -m armelfb_nbsd_eabihf
.else
-EARM_COMPAT_FLAGS+= -target arm--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target arm--netbsdelf-eabihf
ARM_MACHINE_ARCH= earmhf
ARM_LD= -m armelf_nbsd_eabihf
.endif
CVS commit: src/compat/powerpc64/powerpc
Module Name:src
Committed By: matt
Date: Sat Aug 23 02:20:55 UTC 2014
Modified Files:
src/compat/powerpc64/powerpc: bsd.powerpc.mk
Log Message:
Add
LDFLAGS+= -Wl,-m,elf32ppc_nbsd
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/powerpc64/powerpc/bsd.powerpc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/powerpc64/powerpc/bsd.powerpc.mk
diff -u src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.2 src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.3
--- src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.2 Fri Mar 7 05:48:30 2014
+++ src/compat/powerpc64/powerpc/bsd.powerpc.mk Sat Aug 23 02:20:55 2014
@@ -1,6 +1,10 @@
-# $NetBSD: bsd.powerpc.mk,v 1.2 2014/03/07 05:48:30 matt Exp $
+# $NetBSD: bsd.powerpc.mk,v 1.3 2014/08/23 02:20:55 matt Exp $
LD+= -m elf32ppc_nbsd
+.if empty(LDFLAGS:M*elf32ppc_nbsd*)
+LDFLAGS+= -Wl,-m,elf32ppc_nbsd
+.endif
+.ifndef MLIBDIR
MLIBDIR= powerpc
LIBC_MACHINE_ARCH= ${MLIBDIR}
COMMON_MACHINE_ARCH= ${MLIBDIR}
@@ -13,3 +17,4 @@ LDELFSO_MACHINE_ARCH= ${MLIBDIR}
GOMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
+.endif
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Mon Aug 11 04:33:30 UTC 2014
Modified Files:
src/compat: archdirs.mk
Log Message:
Fix else if botch
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/compat/archdirs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.5 src/compat/archdirs.mk:1.6
--- src/compat/archdirs.mk:1.5 Sun Aug 10 23:40:33 2014
+++ src/compat/archdirs.mk Mon Aug 11 04:33:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.5 2014/08/10 23:40:33 matt Exp $
+# $NetBSD: archdirs.mk,v 1.6 2014/08/11 04:33:30 matt Exp $
# list of subdirs used per-platform
@@ -34,6 +34,6 @@ ARCHDIR_SUBDIR= powerpc64/powerpc
ARCHDIR_SUBDIR+= arm/eabi
#ARCHDIR_SUBDIR+= arm/eabihf
ARCHDIR_SUBDIR+= arm/oabi
-.else if (${MACHINE_ARCH} == "aarch64eb")
+.elif (${MACHINE_ARCH} == "aarch64eb")
ARCHDIR_SUBDIR= arm/eabi
.endif
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Sun Aug 10 23:40:33 UTC 2014
Modified Files:
src/compat: archdirs.mk
Log Message:
Add compat dirs for aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/compat/archdirs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.4 src/compat/archdirs.mk:1.5
--- src/compat/archdirs.mk:1.4 Fri Mar 7 04:16:25 2014
+++ src/compat/archdirs.mk Sun Aug 10 23:40:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.4 2014/03/07 04:16:25 matt Exp $
+# $NetBSD: archdirs.mk,v 1.5 2014/08/10 23:40:33 matt Exp $
# list of subdirs used per-platform
@@ -29,3 +29,11 @@ ARCHDIR_SUBDIR= mips64/64 mips64/o32
.if ${MACHINE_ARCH} == "powerpc64"
ARCHDIR_SUBDIR= powerpc64/powerpc
.endif
+
+.if (${MACHINE_ARCH} == "aarch64")
+ARCHDIR_SUBDIR+= arm/eabi
+#ARCHDIR_SUBDIR+= arm/eabihf
+ARCHDIR_SUBDIR+= arm/oabi
+.else if (${MACHINE_ARCH} == "aarch64eb")
+ARCHDIR_SUBDIR= arm/eabi
+.endif
CVS commit: src/compat/arm
Module Name:src
Committed By: matt
Date: Sun Aug 10 23:26:26 UTC 2014
Modified Files:
src/compat/arm/eabi: bsd.eabi.mk
src/compat/arm/oabi: bsd.oabi.mk
Added Files:
src/compat/arm/eabihf: Makefile bsd.eabihf.mk
Log Message:
MKCOMPAT fixes for aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/arm/eabi/bsd.eabi.mk
cvs rdiff -u -r0 -r1.1 src/compat/arm/eabihf/Makefile \
src/compat/arm/eabihf/bsd.eabihf.mk
cvs rdiff -u -r1.2 -r1.3 src/compat/arm/oabi/bsd.oabi.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/arm/eabi/bsd.eabi.mk
diff -u src/compat/arm/eabi/bsd.eabi.mk:1.2 src/compat/arm/eabi/bsd.eabi.mk:1.3
--- src/compat/arm/eabi/bsd.eabi.mk:1.2 Sat Apr 27 08:44:35 2013
+++ src/compat/arm/eabi/bsd.eabi.mk Sun Aug 10 23:26:25 2014
@@ -1,28 +1,70 @@
-# $NetBSD: bsd.eabi.mk,v 1.2 2013/04/27 08:44:35 matt Exp $
+# $NetBSD: bsd.eabi.mk,v 1.3 2014/08/10 23:26:25 matt Exp $
+
+.if !defined(MLIBDIR)
MLIBDIR= eabi
-.if ${MACHINE_ARCH:M*eb} != ""
-EARM_MACHINE_ARCH= earmeb
-LD+= -m armelfb_nbsd_eabi
+
+EARM_COMPAT_FLAGS= -mfloat-abi=soft
+EARM_COMPAT_FLAGS+= -mabi=aapcs-linux
+MKSOFTFLOAT=yes
+
+.if ${MACHINE_ARCH} == "aarch64eb"
+EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -mcpu=cortex-a53
+ARM_MACHINE_ARCH= earmv7eb
+LDFLAGS+= -Wl,--be8
+ARM_LD= -m armelfb_nbsd_eabi --be8
+.elif ${MACHINE_ARCH} == "aarch64"
+EARM_COMPAT_FLAGS+= -target arm--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -mcpu=cortex-a53
+ARM_MACHINE_ARCH= earmv7
+ARM_LD= -m armelf_nbsd_eabi
+.elif !empty(MACHINE_ARCH:M*eb)
+EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-gnueabi
+ARM_MACHINE_ARCH= earmeb
+ARM_LD= -m armelfb_nbsd_eabi
.else
-EARM_MACHINE_ARCH= earm
-LD+= -m armelf_nbsd_eabi
+EARM_COMPAT_FLAGS+= -target arm--netbsdelf-gnueabi
+ARM_MACHINE_ARCH= earm
+ARM_LD= -m armelf_nbsd_eabi
.endif
-LIBC_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
-LIBGCC_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
-COMMON_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
-KVM_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
-PTHREAD_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
-BFD_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
-CSU_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
-CRYPTO_MACHINE_CPU= ${EARM_MACHINE_ARCH}
-LDELFSO_MACHINE_CPU= ${EARM_MACHINE_ARCH}
-GOMP_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
-
-COPTS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
-CPUFLAGS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
-LDADD+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
-LDFLAGS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
-MKDEPFLAGS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
+
+EARM_COMPAT_FLAGS+= -B ${TOOLDIR}/aarch64--netbsd/bin
+
+LIBC_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+LIBGCC_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+LIBEXECINFO_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+LIBM_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+COMMON_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+KVM_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+PTHREAD_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+BFD_MACHINE_ARCH= earm
+CSU_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+GOMP_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+
+COMMON_MACHINE_CPU= arm
+COMPAT_MACHINE_CPU= arm
+CRYPTO_MACHINE_CPU= arm
+CSU_MACHINE_CPU= arm
+KVM_MACHINE_CPU= arm
+LDELFSO_MACHINE_CPU= arm
+LIBC_MACHINE_CPU= arm
+PTHREAD_MACHINE_CPU= arm
+
+.if defined(ACTIVE_CC)
+EARM_COMPAT_FLAGS+= ${${ACTIVE_CC} == "gcc":?-Wa,-meabi=5:}
+.endif
+
+COPTS+= ${EARM_COMPAT_FLAGS}
+CPUFLAGS+= ${EARM_COMPAT_FLAGS}
+LDADD+= ${EARM_COMPAT_FLAGS}
+LDFLAGS+= ${EARM_COMPAT_FLAGS}
+MKDEPFLAGS+= ${EARM_COMPAT_FLAGS}
.include "${.PARSEDIR}/../../Makefile.compat"
+
+.endif
+
+.if empty(LD:M-m)
+LD+= ${ARM_LD}
+.endif
Index: src/compat/arm/oabi/bsd.oabi.mk
diff -u src/compat/arm/oabi/bsd.oabi.mk:1.2 src/compat/arm/oabi/bsd.oabi.mk:1.3
--- src/compat/arm/oabi/bsd.oabi.mk:1.2 Sun Dec 15 18:08:37 2013
+++ src/compat/arm/oabi/bsd.oabi.mk Sun Aug 10 23:26:26 2014
@@ -1,29 +1,56 @@
-# $NetBSD: bsd.oabi.mk,v 1.2 2013/12/15 18:08:37 joerg Exp $
+# $NetBSD: bsd.oabi.mk,v 1.3 2014/08/10 23:26:26 matt Exp $
+.if !defined(MLIBDIR)
MLIBDIR= oabi
-.if ${MACHINE_ARCH:M*eb} != ""
+
+.if ${MACHINE_ARCH} == "aarch64eb"
+.error oabi is not supported on big endian AARCH64
+.elif ${MACHINE_ARCH} == "aarch64"
+ARM_MACHINE_ARCH= arm
+ARM_LD= -m armelf_nbsd
+LDFLAGS+= -Wl,-m,armelf_nbsd
+COPTS+= -mcpu=cortex-a53
+ARM_APCS_FLAGS= ${${ACTIVE_CC} == "clang":? -target arm--netbsdelf -B ${TOOLDIR}/aarch64--netbsd/bin :} -mabi=apcs-gnu -mfloat-abi=soft
+.elif !empty(MACHINE_ARCH:M*eb)
ARM_MACHINE_ARCH= armeb
-LD+= -m armelfb
+ARM_LD= -m armelfb_nbsd
+LDFLAGS+= -Wl,-m,armelfb_nbsd
.else
ARM_MACHINE_ARCH= arm
-LD+= -m armelf
+ARM_LD= -m armelf_nbsd
+LDFLAGS+= -Wl,-m,armelf_nbsd
.endif
+
LIBC_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
LIBGCC_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
LIBEXECINFO_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+LIBM_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
COMMON_
CVS commit: src/compat/powerpc64/powerpc
Module Name:src
Committed By: matt
Date: Fri Mar 7 05:48:30 UTC 2014
Modified Files:
src/compat/powerpc64/powerpc: bsd.powerpc.mk
Log Message:
No need for LDFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/powerpc64/powerpc/bsd.powerpc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/powerpc64/powerpc/bsd.powerpc.mk
diff -u src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.1 src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.2
--- src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.1 Fri Mar 7 04:16:25 2014
+++ src/compat/powerpc64/powerpc/bsd.powerpc.mk Fri Mar 7 05:48:30 2014
@@ -1,7 +1,6 @@
-# $NetBSD: bsd.powerpc.mk,v 1.1 2014/03/07 04:16:25 matt Exp $
+# $NetBSD: bsd.powerpc.mk,v 1.2 2014/03/07 05:48:30 matt Exp $
LD+= -m elf32ppc_nbsd
-LDFLAGS+= -Wl,-m,elf32ppc_nbsd
MLIBDIR= powerpc
LIBC_MACHINE_ARCH= ${MLIBDIR}
COMMON_MACHINE_ARCH= ${MLIBDIR}
@@ -10,7 +9,7 @@ PTHREAD_MACHINE_ARCH= ${MLIBDIR}
BFD_MACHINE_ARCH= ${MLIBDIR}
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
-LDELFSO_MACHINE_CPU= ${MLIBDIR}
+LDELFSO_MACHINE_ARCH= ${MLIBDIR}
GOMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Fri Mar 7 04:16:25 UTC 2014
Modified Files:
src/compat: archdirs.mk
Added Files:
src/compat/powerpc64/powerpc: Makefile bsd.powerpc.mk
Log Message:
Add MKCOMPAT support for powerpc64.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/compat/archdirs.mk
cvs rdiff -u -r0 -r1.1 src/compat/powerpc64/powerpc/Makefile \
src/compat/powerpc64/powerpc/bsd.powerpc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.3 src/compat/archdirs.mk:1.4
--- src/compat/archdirs.mk:1.3 Sat Apr 27 08:44:35 2013
+++ src/compat/archdirs.mk Fri Mar 7 04:16:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.3 2013/04/27 08:44:35 matt Exp $
+# $NetBSD: archdirs.mk,v 1.4 2014/03/07 04:16:25 matt Exp $
# list of subdirs used per-platform
@@ -25,3 +25,7 @@ ARCHDIR_SUBDIR= arm/oabi arm/eabi
.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
ARCHDIR_SUBDIR= mips64/64 mips64/o32
.endif
+
+.if ${MACHINE_ARCH} == "powerpc64"
+ARCHDIR_SUBDIR= powerpc64/powerpc
+.endif
Added files:
Index: src/compat/powerpc64/powerpc/Makefile
diff -u /dev/null src/compat/powerpc64/powerpc/Makefile:1.1
--- /dev/null Fri Mar 7 04:16:25 2014
+++ src/compat/powerpc64/powerpc/Makefile Fri Mar 7 04:16:25 2014
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2014/03/07 04:16:25 matt Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.powerpc.mk
+
+.include "../../compatsubdir.mk"
Index: src/compat/powerpc64/powerpc/bsd.powerpc.mk
diff -u /dev/null src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.1
--- /dev/null Fri Mar 7 04:16:25 2014
+++ src/compat/powerpc64/powerpc/bsd.powerpc.mk Fri Mar 7 04:16:25 2014
@@ -0,0 +1,16 @@
+# $NetBSD: bsd.powerpc.mk,v 1.1 2014/03/07 04:16:25 matt Exp $
+
+LD+= -m elf32ppc_nbsd
+LDFLAGS+= -Wl,-m,elf32ppc_nbsd
+MLIBDIR= powerpc
+LIBC_MACHINE_ARCH= ${MLIBDIR}
+COMMON_MACHINE_ARCH= ${MLIBDIR}
+KVM_MACHINE_ARCH= ${MLIBDIR}
+PTHREAD_MACHINE_ARCH= ${MLIBDIR}
+BFD_MACHINE_ARCH= ${MLIBDIR}
+CSU_MACHINE_ARCH= ${MLIBDIR}
+CRYPTO_MACHINE_CPU= ${MLIBDIR}
+LDELFSO_MACHINE_CPU= ${MLIBDIR}
+GOMP_MACHINE_ARCH= ${MLIBDIR}
+
+.include "${.PARSEDIR}/../../m32.mk"
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Sat Apr 27 08:44:35 UTC 2013
Modified Files:
src/compat: archdirs.mk
src/compat/arm/eabi: bsd.eabi.mk
Added Files:
src/compat/arm/oabi: Makefile bsd.oabi.mk
Log Message:
MKCOMPAT support for earm.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/archdirs.mk
cvs rdiff -u -r1.1 -r1.2 src/compat/arm/eabi/bsd.eabi.mk
cvs rdiff -u -r0 -r1.1 src/compat/arm/oabi/Makefile \
src/compat/arm/oabi/bsd.oabi.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.2 src/compat/archdirs.mk:1.3
--- src/compat/archdirs.mk:1.2 Fri Aug 3 08:02:47 2012
+++ src/compat/archdirs.mk Sat Apr 27 08:44:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.2 2012/08/03 08:02:47 matt Exp $
+# $NetBSD: archdirs.mk,v 1.3 2013/04/27 08:44:35 matt Exp $
# list of subdirs used per-platform
@@ -10,10 +10,18 @@ ARCHDIR_SUBDIR= sparc64/sparc
ARCHDIR_SUBDIR= amd64/i386
.endif
-.if (${MACHINE_ARCH} == "armeb" || ${MACHINE_ARCH} == "arm")
+.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
ARCHDIR_SUBDIR= arm/eabi
.endif
+.if (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb")
+ARCHDIR_SUBDIR= arm/oabi
+.endif
+
+.if (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb")
+ARCHDIR_SUBDIR= arm/oabi arm/eabi
+.endif
+
.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
ARCHDIR_SUBDIR= mips64/64 mips64/o32
.endif
Index: src/compat/arm/eabi/bsd.eabi.mk
diff -u src/compat/arm/eabi/bsd.eabi.mk:1.1 src/compat/arm/eabi/bsd.eabi.mk:1.2
--- src/compat/arm/eabi/bsd.eabi.mk:1.1 Fri Aug 3 08:02:47 2012
+++ src/compat/arm/eabi/bsd.eabi.mk Sat Apr 27 08:44:35 2013
@@ -1,11 +1,28 @@
-# $NetBSD: bsd.eabi.mk,v 1.1 2012/08/03 08:02:47 matt Exp $
+# $NetBSD: bsd.eabi.mk,v 1.2 2013/04/27 08:44:35 matt Exp $
-MLIBDIR= eabi
+MLIBDIR= eabi
+.if ${MACHINE_ARCH:M*eb} != ""
+EARM_MACHINE_ARCH= earmeb
+LD+= -m armelfb_nbsd_eabi
+.else
+EARM_MACHINE_ARCH= earm
+LD+= -m armelf_nbsd_eabi
+.endif
+LIBC_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
+LIBGCC_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
+COMMON_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
+KVM_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
+PTHREAD_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
+BFD_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
+CSU_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
+CRYPTO_MACHINE_CPU= ${EARM_MACHINE_ARCH}
+LDELFSO_MACHINE_CPU= ${EARM_MACHINE_ARCH}
+GOMP_MACHINE_ARCH= ${EARM_MACHINE_ARCH}
-COPTS+= -mabi=aapcs-linux
-CPUFLAGS+= -mabi=aapcs-linux
-LDADD+= -mabi=aapcs-linux
-LDFLAGS+= -mabi=aapcs-linux
-MKDEPFLAGS+= -mabi=aapcs-linux
+COPTS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
+CPUFLAGS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
+LDADD+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
+LDFLAGS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
+MKDEPFLAGS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
.include "${.PARSEDIR}/../../Makefile.compat"
Added files:
Index: src/compat/arm/oabi/Makefile
diff -u /dev/null src/compat/arm/oabi/Makefile:1.1
--- /dev/null Sat Apr 27 08:44:35 2013
+++ src/compat/arm/oabi/Makefile Sat Apr 27 08:44:35 2013
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2013/04/27 08:44:35 matt Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.oabi.mk
+
+.include "../../compatsubdir.mk"
Index: src/compat/arm/oabi/bsd.oabi.mk
diff -u /dev/null src/compat/arm/oabi/bsd.oabi.mk:1.1
--- /dev/null Sat Apr 27 08:44:35 2013
+++ src/compat/arm/oabi/bsd.oabi.mk Sat Apr 27 08:44:35 2013
@@ -0,0 +1,29 @@
+# $NetBSD: bsd.oabi.mk,v 1.1 2013/04/27 08:44:35 matt Exp $
+
+MLIBDIR= oabi
+.if ${MACHINE_ARCH:M*eb} != ""
+ARM_MACHINE_ARCH= armeb
+LD+= -m armelfb
+.else
+ARM_MACHINE_ARCH= arm
+LD+= -m armelf
+.endif
+LIBC_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+LIBGCC_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+LIBEXECINFO_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+COMMON_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+KVM_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+PTHREAD_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+BFD_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+CSU_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+CRYPTO_MACHINE_CPU= ${ARM_MACHINE_ARCH}
+LDELFSO_MACHINE_CPU= ${ARM_MACHINE_ARCH}
+GOMP_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+
+COPTS+= -mabi=apcs-gnu -mfloat-abi=soft
+CPUFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
+LDADD+= -mabi=apcs-gnu -mfloat-abi=soft
+LDFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
+MKDEPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
+
+.include "${.PARSEDIR}/../../Makefile.compat"
CVS commit: src/compat/mips64/o32
Module Name:src
Committed By: matt
Date: Thu Feb 14 09:22:18 UTC 2013
Modified Files:
src/compat/mips64/o32: bsd.o32.mk
Log Message:
Define LIBGCC_MACHINE_ARCH so correct files are used o32 libgcc.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.9 src/compat/mips64/o32/bsd.o32.mk:1.10
--- src/compat/mips64/o32/bsd.o32.mk:1.9 Fri Sep 23 06:44:37 2011
+++ src/compat/mips64/o32/bsd.o32.mk Thu Feb 14 09:22:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $
+# $NetBSD: bsd.o32.mk,v 1.10 2013/02/14 09:22:18 matt Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
@@ -7,6 +7,7 @@ LD+= -m elf32ltsmip
.endif
MLIBDIR= o32
+LIBGCC_MACHINE_ARCH=${MACHINE_ARCH:S/64//}
GOMP_MACHINE_ARCH=${MACHINE_ARCH:S/64//}
COPTS+= -mabi=32 -march=mips3
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Fri Aug 3 08:02:47 UTC 2012
Modified Files:
src/compat: archdirs.mk
Added Files:
src/compat/arm/eabi: Makefile bsd.eabi.mk
Log Message:
Initial MKCOMPAT support for ARM EABI. (doesn't quite work right)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/archdirs.mk
cvs rdiff -u -r0 -r1.1 src/compat/arm/eabi/Makefile \
src/compat/arm/eabi/bsd.eabi.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.1 src/compat/archdirs.mk:1.2
--- src/compat/archdirs.mk:1.1 Sun Dec 13 09:27:13 2009
+++ src/compat/archdirs.mk Fri Aug 3 08:02:47 2012
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.1 2009/12/13 09:27:13 mrg Exp $
+# $NetBSD: archdirs.mk,v 1.2 2012/08/03 08:02:47 matt Exp $
# list of subdirs used per-platform
@@ -10,6 +10,10 @@ ARCHDIR_SUBDIR= sparc64/sparc
ARCHDIR_SUBDIR= amd64/i386
.endif
+.if (${MACHINE_ARCH} == "armeb" || ${MACHINE_ARCH} == "arm")
+ARCHDIR_SUBDIR= arm/eabi
+.endif
+
.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
ARCHDIR_SUBDIR= mips64/64 mips64/o32
.endif
Added files:
Index: src/compat/arm/eabi/Makefile
diff -u /dev/null src/compat/arm/eabi/Makefile:1.1
--- /dev/null Fri Aug 3 08:02:47 2012
+++ src/compat/arm/eabi/Makefile Fri Aug 3 08:02:47 2012
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2012/08/03 08:02:47 matt Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.eabi.mk
+
+.include "../../compatsubdir.mk"
Index: src/compat/arm/eabi/bsd.eabi.mk
diff -u /dev/null src/compat/arm/eabi/bsd.eabi.mk:1.1
--- /dev/null Fri Aug 3 08:02:47 2012
+++ src/compat/arm/eabi/bsd.eabi.mk Fri Aug 3 08:02:47 2012
@@ -0,0 +1,11 @@
+# $NetBSD: bsd.eabi.mk,v 1.1 2012/08/03 08:02:47 matt Exp $
+
+MLIBDIR= eabi
+
+COPTS+= -mabi=aapcs-linux
+CPUFLAGS+= -mabi=aapcs-linux
+LDADD+= -mabi=aapcs-linux
+LDFLAGS+= -mabi=aapcs-linux
+MKDEPFLAGS+= -mabi=aapcs-linux
+
+.include "${.PARSEDIR}/../../Makefile.compat"
CVS commit: src/compat
Module Name:src
Committed By: wiz
Date: Thu Mar 29 18:35:11 UTC 2012
Modified Files:
src/compat: README
Log Message:
Fix typos; wording.
>From patch by Bug Hunting.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/compat/README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/README
diff -u src/compat/README:1.7 src/compat/README:1.8
--- src/compat/README:1.7 Sun Apr 17 01:29:06 2011
+++ src/compat/README Thu Mar 29 18:35:11 2012
@@ -1,7 +1,7 @@
-$NetBSD: README,v 1.7 2011/04/17 01:29:06 mrg Exp $
+$NetBSD: README,v 1.8 2012/03/29 18:35:11 wiz Exp $
-Building multi- ABI libraries for NetBSD platforms.
+Building multi-ABI libraries for NetBSD platforms.
src/compat has a framework to (re)build the libraries shipped with
@@ -15,11 +15,11 @@ The basic premise is to re-set $MAKEOBJD
underneath src/compat and rebuild the libraries with a different set
of options. Each platform wanting support should create their port
subdirectory directly in src/compat, and then one subdirectory in here
-for each ABI required. e.g., src/compat/amd64/i386 is where we build
+for each ABI required, e.g., src/compat/amd64/i386 is where we build
the 32-bit compat libraries for the amd64 port. In each of these
-subdirs, a small Makefile and makefile fragment should exist. The
+subdirectories, a small Makefile and makefile fragment should exist. The
Makefile should set BSD_MK_COMPAT_FILE to equal the fragment, and then
-include "../../compatsubdir.mk" Eg, amd64/i386/Makefile has:
+include "../../compatsubdir.mk". E.g., amd64/i386/Makefile has:
BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.i386.mk
@@ -60,7 +60,7 @@ ld.elf_so) to build with this ABI.
archdirs.mk holds the list of subdirectories for each port.
Makefile.compat has the basic framework to force the right paths for
-library and ld.elf_so linkage. It contains a hack to create subdirs
+library and ld.elf_so linkage. It contains a hack to create subdirectories
in the build that should be fixed.
dirshack/Makefile is a hack to get objdirs created timely, and should
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Fri Sep 23 06:44:37 UTC 2011
Modified Files:
src/compat/amd64/i386: bsd.i386.mk
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
src/compat/sparc64/sparc: bsd.sparc.mk
Log Message:
build compat versions of libgomp for everything except mips N64 (for now.)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/compat/amd64/i386/bsd.i386.mk
cvs rdiff -u -r1.8 -r1.9 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.8 -r1.9 src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r1.4 -r1.5 src/compat/sparc64/sparc/bsd.sparc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/amd64/i386/bsd.i386.mk
diff -u src/compat/amd64/i386/bsd.i386.mk:1.4 src/compat/amd64/i386/bsd.i386.mk:1.5
--- src/compat/amd64/i386/bsd.i386.mk:1.4 Thu Jul 21 03:13:30 2011
+++ src/compat/amd64/i386/bsd.i386.mk Fri Sep 23 06:44:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386.mk,v 1.4 2011/07/21 03:13:30 mrg Exp $
+# $NetBSD: bsd.i386.mk,v 1.5 2011/09/23 06:44:36 mrg Exp $
LD+= -m elf_i386
MLIBDIR= i386
@@ -10,5 +10,6 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+GOMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.8 src/compat/mips64/64/bsd.64.mk:1.9
--- src/compat/mips64/64/bsd.64.mk:1.8 Thu Jul 21 03:13:30 2011
+++ src/compat/mips64/64/bsd.64.mk Fri Sep 23 06:44:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.64.mk,v 1.8 2011/07/21 03:13:30 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
@@ -7,6 +7,11 @@
.endif
MLIBDIR= 64
+# XXX
+# GCC 4.5 libgomp wants a different omp.h installed for the 64 bit
+# version of it, and we don't have a way of doing that yet.
+NO_LIBGOMP= 1
+
COPTS+= -mabi=64
CPUFLAGS+= -mabi=64
LDADD+= -mabi=64
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.8 src/compat/mips64/o32/bsd.o32.mk:1.9
--- src/compat/mips64/o32/bsd.o32.mk:1.8 Thu Jul 21 03:13:31 2011
+++ src/compat/mips64/o32/bsd.o32.mk Fri Sep 23 06:44:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.8 2011/07/21 03:13:31 mrg Exp $
+# $NetBSD: bsd.o32.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
@@ -7,6 +7,8 @@
.endif
MLIBDIR= o32
+GOMP_MACHINE_ARCH=${MACHINE_ARCH:S/64//}
+
COPTS+= -mabi=32 -march=mips3
CPUFLAGS+= -mabi=32 -march=mips3
LDADD+= -mabi=32 -march=mips3
Index: src/compat/sparc64/sparc/bsd.sparc.mk
diff -u src/compat/sparc64/sparc/bsd.sparc.mk:1.4 src/compat/sparc64/sparc/bsd.sparc.mk:1.5
--- src/compat/sparc64/sparc/bsd.sparc.mk:1.4 Thu Jul 21 03:13:31 2011
+++ src/compat/sparc64/sparc/bsd.sparc.mk Fri Sep 23 06:44:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sparc.mk,v 1.4 2011/07/21 03:13:31 mrg Exp $
+# $NetBSD: bsd.sparc.mk,v 1.5 2011/09/23 06:44:37 mrg Exp $
LD+= -m elf32_sparc
MLIBDIR= sparc
@@ -10,5 +10,6 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+GOMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
CVS commit: src/compat/mips64
Module Name:src
Committed By: mrg
Date: Mon Jul 4 12:00:49 UTC 2011
Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
Log Message:
the gmp/mpfr subdirs are mipsel/mipseb.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.5 -r1.6 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.5 src/compat/mips64/64/bsd.64.mk:1.6
--- src/compat/mips64/64/bsd.64.mk:1.5 Fri Jul 1 01:30:16 2011
+++ src/compat/mips64/64/bsd.64.mk Mon Jul 4 12:00:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.64.mk,v 1.5 2011/07/01 01:30:16 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
@@ -13,7 +13,7 @@
LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
-LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
-LIBGMP_MACHINE_ARCH= ${MLIBDIR}
+LIBMPFR_MACHINE_ARCH= mipseb
+LIBGMP_MACHINE_ARCH= mipseb
.include "${.PARSEDIR}/../../Makefile.compat"
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.5 src/compat/mips64/o32/bsd.o32.mk:1.6
--- src/compat/mips64/o32/bsd.o32.mk:1.5 Fri Jul 1 01:30:16 2011
+++ src/compat/mips64/o32/bsd.o32.mk Mon Jul 4 12:00:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.5 2011/07/01 01:30:16 mrg Exp $
+# $NetBSD: bsd.o32.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
@@ -13,7 +13,7 @@
LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
-LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
-LIBGMP_MACHINE_ARCH= ${MLIBDIR}
+LIBMPFR_MACHINE_ARCH= mipsel
+LIBGMP_MACHINE_ARCH= mipsel
.include "${.PARSEDIR}/../../Makefile.compat"
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Sat Jun 18 01:22:34 UTC 2011
Modified Files:
src/compat: m32.mk
Log Message:
avoid adding -m32 to various variables multiple times aka, multiple inclusions.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/m32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/m32.mk
diff -u src/compat/m32.mk:1.1 src/compat/m32.mk:1.2
--- src/compat/m32.mk:1.1 Sun Dec 13 09:27:34 2009
+++ src/compat/m32.mk Sat Jun 18 01:22:34 2011
@@ -1,9 +1,12 @@
-# $NetBSD: m32.mk,v 1.1 2009/12/13 09:27:34 mrg Exp $
+# $NetBSD: m32.mk,v 1.2 2011/06/18 01:22:34 mrg Exp $
#
# Makefile fragment to help implement a set of 'cc -m32' libraries.
#
+.ifndef _COMPAT_M32_MK_ # {
+_COMPAT_M32_MK_=1
+
COPTS+= -m32
CPUFLAGS+= -m32
LDADD+= -m32
@@ -11,3 +14,5 @@
MKDEPFLAGS+= -m32
.include "Makefile.compat"
+
+.endif # _COMPAT_M32_MK_ }
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Sun Apr 17 01:29:07 UTC 2011
Modified Files:
src/compat: README
src/compat/dirshack: Makefile
Log Message:
catch up with s/MAKEDIROBJPREFIX/MAKEOBJDIR/ changes in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/README
cvs rdiff -u -r1.1 -r1.2 src/compat/dirshack/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/README
diff -u src/compat/README:1.6 src/compat/README:1.7
--- src/compat/README:1.6 Wed Jun 30 03:28:01 2010
+++ src/compat/README Sun Apr 17 01:29:06 2011
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.6 2010/06/30 03:28:01 mrg Exp $
+$NetBSD: README,v 1.7 2011/04/17 01:29:06 mrg Exp $
Building multi- ABI libraries for NetBSD platforms.
@@ -11,7 +11,7 @@
new 32-bit (default, "n32", 64-bit CPU required) or the 64-bit ABI.
-The basic premise is to re-set $MAKEOBJDIRPREFIX to fresh subdirectory
+The basic premise is to re-set $MAKEOBJDIR to fresh subdirectory
underneath src/compat and rebuild the libraries with a different set
of options. Each platform wanting support should create their port
subdirectory directly in src/compat, and then one subdirectory in here
Index: src/compat/dirshack/Makefile
diff -u src/compat/dirshack/Makefile:1.1 src/compat/dirshack/Makefile:1.2
--- src/compat/dirshack/Makefile:1.1 Sun Dec 13 09:25:57 2009
+++ src/compat/dirshack/Makefile Sun Apr 17 01:29:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/12/13 09:25:57 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/17 01:29:06 mrg Exp $
# hacky method to get compat multilib base objdirs created before
# make tries to go create the subdirs used for builds.
@@ -6,7 +6,7 @@
# the problem is that make handles objdir creation for subdirs before it
# handles this current directory, so when make cd's into $arch/$libtype
# and from there into the ../../lib dirs, it ends up setting the forced
-# MAKEOBJDIRPREFIX to something based upon ${.CURDIR}, since the objdir
+# MAKEOBJDIR to something based upon ${.CURDIR}, since the objdir
# doesn't exist yet.
#
# our solution is simple - from this Makefile we traverse the same list
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Mon Jan 31 10:58:15 UTC 2011
Modified Files:
src/compat: compatsubdir.mk
Log Message:
if using MAKEOBJDIRPREFIX, make sure to unset it since it would override
the use of MAKEOBJDIR.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/compatsubdir.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.6 src/compat/compatsubdir.mk:1.7
--- src/compat/compatsubdir.mk:1.6 Thu Jan 20 18:43:52 2011
+++ src/compat/compatsubdir.mk Mon Jan 31 10:58:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.6 2011/01/20 18:43:52 matt Exp $
+# $NetBSD: compatsubdir.mk,v 1.7 2011/01/31 10:58:14 matt Exp $
# Build netbsd libraries.
@@ -10,7 +10,13 @@
# make sure we get an objdir built early enough
.include
-MAKEDIRTARGETENV= MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}' MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
+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}
CVS commit: src/compat
Module Name:src
Committed By: matt
Date: Thu Jan 20 18:43:53 UTC 2011
Modified Files:
src/compat: compatsubdir.mk
Log Message:
Change to use MAKEOBJDIR instead of MAKEOBJDIRPREFIX
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/compat/compatsubdir.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.5 src/compat/compatsubdir.mk:1.6
--- src/compat/compatsubdir.mk:1.5 Fri Dec 3 21:38:48 2010
+++ src/compat/compatsubdir.mk Thu Jan 20 18:43:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.5 2010/12/03 21:38:48 plunky Exp $
+# $NetBSD: compatsubdir.mk,v 1.6 2011/01/20 18:43:52 matt Exp $
# Build netbsd libraries.
@@ -10,8 +10,7 @@
# 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}
+MAKEDIRTARGETENV= MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}' MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
.if defined(BOOTSTRAP_SUBDIRS)
SUBDIR= ${BOOTSTRAP_SUBDIRS}
CVS commit: src/compat/lib/libterminfo
Module Name:src Committed By: mrg Date: Sat Nov 27 23:08:45 UTC 2010 Removed Files: src/compat/lib/libterminfo: Makefile Log Message: delete a file that never did anything in -current. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/compat/lib/libterminfo/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Wed Jun 30 03:28:02 UTC 2010
Modified Files:
src/compat: README
Log Message:
update this to reality a little.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/compat/README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/README
diff -u src/compat/README:1.5 src/compat/README:1.6
--- src/compat/README:1.5 Sun Dec 13 17:58:27 2009
+++ src/compat/README Wed Jun 30 03:28:01 2010
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.5 2009/12/13 17:58:27 snj Exp $
+$NetBSD: README,v 1.6 2010/06/30 03:28:01 mrg Exp $
Building multi- ABI libraries for NetBSD platforms.
@@ -19,11 +19,11 @@
the 32-bit compat libraries for the amd64 port. In each of these
subdirs, a small Makefile and makefile fragment should exist. The
Makefile should set BSD_MK_COMPAT_FILE to equal the fragment, and then
-include "../../Makefile.common". Eg, amd64/i386/Makefile has:
+include "../../compatsubdir.mk" Eg, amd64/i386/Makefile has:
BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.i386.mk
- .include "../../Makefile.common"
+ .include "../../compatsubdir.mk"
In the makefile fragment any changes to ABI flags are passed here
and the MLIBDIR variable must be set to the subdirectory in /usr/lib
@@ -41,9 +41,9 @@
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
- .include "${NETBSDSRCDIR}/compat/Makefile.m32"
+ .include "${NETBSDSRCDIR}/compat/m32.mk"
-and the referenced Makefile.m32 looks like:
+and the referenced m32.mk looks like:
COPTS+= -m32
CPUFLAGS+= -m32
@@ -54,10 +54,10 @@
.include "Makefile.compat"
-Makefile.common holds the list of subdirectories (the libraries and
+compatsubdir.mk holds the list of subdirectories (the libraries and
ld.elf_so) to build with this ABI.
-Makefile.md_subdir holds the list of subdirectories for each port.
+archdirs.mk holds the list of subdirectories for each port.
Makefile.compat has the basic framework to force the right paths for
library and ld.elf_so linkage. It contains a hack to create subdirs
CVS commit: src/compat
Module Name:src
Committed By: christos
Date: Sat Dec 19 04:11:33 UTC 2009
Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
src/compat/sparc64/sparc: bsd.sparc.mk
Log Message:
Avoid using ${NETBSDSRCDIR} by using ${.PARSEDIR} like I did for amd64/i386
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.3 -r1.4 src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r1.1 -r1.2 src/compat/sparc64/sparc/bsd.sparc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.3 src/compat/mips64/64/bsd.64.mk:1.4
--- src/compat/mips64/64/bsd.64.mk:1.3 Mon Dec 14 23:05:34 2009
+++ src/compat/mips64/64/bsd.64.mk Fri Dec 18 23:11:32 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.64.mk,v 1.3 2009/12/15 04:05:34 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.4 2009/12/19 04:11:32 christos Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
@@ -13,4 +13,4 @@
LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
-.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.PARSEDIR}/../../Makefile.compat"
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.3 src/compat/mips64/o32/bsd.o32.mk:1.4
--- src/compat/mips64/o32/bsd.o32.mk:1.3 Mon Dec 14 23:05:34 2009
+++ src/compat/mips64/o32/bsd.o32.mk Fri Dec 18 23:11:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.3 2009/12/15 04:05:34 mrg Exp $
+# $NetBSD: bsd.o32.mk,v 1.4 2009/12/19 04:11:33 christos Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
@@ -13,4 +13,4 @@
LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
-.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.PARSEDIR}/../../Makefile.compat"
Index: src/compat/sparc64/sparc/bsd.sparc.mk
diff -u src/compat/sparc64/sparc/bsd.sparc.mk:1.1 src/compat/sparc64/sparc/bsd.sparc.mk:1.2
--- src/compat/sparc64/sparc/bsd.sparc.mk:1.1 Sun Dec 13 04:07:32 2009
+++ src/compat/sparc64/sparc/bsd.sparc.mk Fri Dec 18 23:11:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sparc.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $
+# $NetBSD: bsd.sparc.mk,v 1.2 2009/12/19 04:11:33 christos Exp $
LD+= -m elf32_sparc
MLIBDIR= sparc
@@ -11,4 +11,4 @@
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
-.include "${NETBSDSRCDIR}/compat/m32.mk"
+.include "${.PARSEDIR}/../../m32.mk"
CVS commit: src/compat/amd64/i386
Module Name:src
Committed By: christos
Date: Sat Dec 19 00:15:13 UTC 2009
Modified Files:
src/compat/amd64/i386: bsd.i386.mk
Log Message:
Don't use ${NETBSDSRCDIR}. It might not be set yet.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/amd64/i386/bsd.i386.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/amd64/i386/bsd.i386.mk
diff -u src/compat/amd64/i386/bsd.i386.mk:1.1 src/compat/amd64/i386/bsd.i386.mk:1.2
--- src/compat/amd64/i386/bsd.i386.mk:1.1 Sun Dec 13 04:07:32 2009
+++ src/compat/amd64/i386/bsd.i386.mk Fri Dec 18 19:15:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $
+# $NetBSD: bsd.i386.mk,v 1.2 2009/12/19 00:15:13 christos Exp $
LD+= -m elf_i386
MLIBDIR= i386
@@ -11,4 +11,4 @@
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
-.include "${NETBSDSRCDIR}/compat/m32.mk"
+.include "${.PARSEDIR}/../../m32.mk"
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Tue Dec 15 05:23:25 UTC 2009
Modified Files:
src/compat: compatsubdir.mk
Log Message:
add iscsi/lib
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/compatsubdir.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.2 src/compat/compatsubdir.mk:1.3
--- src/compat/compatsubdir.mk:1.2 Tue Dec 15 04:12:43 2009
+++ src/compat/compatsubdir.mk Tue Dec 15 05:23:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.2 2009/12/15 04:12:43 mrg Exp $
+# $NetBSD: compatsubdir.mk,v 1.3 2009/12/15 05:23:25 mrg Exp $
# Build netbsd libraries.
@@ -41,6 +41,10 @@
SUBDIR+= ../../../external/gpl3/binutils/lib
.endif
+.if (${MKISCSI} != "no")
+SUBDIR+= ../../../external/bsd/iscsi/lib
+.endif
+
.endif
.include
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Tue Dec 15 04:12:43 UTC 2009
Modified Files:
src/compat: compatsubdir.mk
Log Message:
don't build atf, openldap or binutils if their MK* == "no".
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/compatsubdir.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.1 src/compat/compatsubdir.mk:1.2
--- src/compat/compatsubdir.mk:1.1 Sun Dec 13 09:27:13 2009
+++ src/compat/compatsubdir.mk Tue Dec 15 04:12:43 2009
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.1 2009/12/13 09:27:13 mrg Exp $
+# $NetBSD: compatsubdir.mk,v 1.2 2009/12/15 04:12:43 mrg Exp $
# Build netbsd libraries.
@@ -24,13 +24,23 @@
../../../lib/libutil .WAIT \
../../../lib .WAIT \
../../../gnu/lib \
- ../../../external/bsd/atf/lib \
../../../external/bsd/bind/lib \
../../../external/bsd/libevent/lib \
../../../external/bsd/file/lib \
- ../../../external/bsd/openldap/lib \
- ../../../external/gpl3/binutils/lib \
../../../libexec/ld.elf_so
+
+.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
+
.endif
.include
CVS commit: src/compat/mips64
Module Name:src
Committed By: mrg
Date: Tue Dec 15 04:05:35 UTC 2009
Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
Log Message:
fix the previous: default the target depending the MACHINE_ARCH.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.2 -r1.3 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.2 src/compat/mips64/64/bsd.64.mk:1.3
--- src/compat/mips64/64/bsd.64.mk:1.2 Mon Dec 14 13:43:59 2009
+++ src/compat/mips64/64/bsd.64.mk Tue Dec 15 04:05:34 2009
@@ -1,6 +1,10 @@
-# $NetBSD: bsd.64.mk,v 1.2 2009/12/14 13:43:59 uebayasi Exp $
+# $NetBSD: bsd.64.mk,v 1.3 2009/12/15 04:05:34 mrg Exp $
-LD+= -m elf64btsmip # XXX endian
+.if ${MACHINE_ARCH} == "mips64eb"
+LD+= -m elf64btsmip
+.else
+LD+= -m elf64ltsmip
+.endif
MLIBDIR= 64
COPTS+= -mabi=64
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.2 src/compat/mips64/o32/bsd.o32.mk:1.3
--- src/compat/mips64/o32/bsd.o32.mk:1.2 Mon Dec 14 13:43:59 2009
+++ src/compat/mips64/o32/bsd.o32.mk Tue Dec 15 04:05:34 2009
@@ -1,6 +1,10 @@
-# $NetBSD: bsd.o32.mk,v 1.2 2009/12/14 13:43:59 uebayasi Exp $
+# $NetBSD: bsd.o32.mk,v 1.3 2009/12/15 04:05:34 mrg Exp $
-LD+= -m elf32btsmip # XXX endian
+.if ${MACHINE_ARCH} == "mips64eb"
+LD+= -m elf32btsmip
+.else
+LD+= -m elf32ltsmip
+.endif
MLIBDIR= o32
COPTS+= -mabi=32 -march=mips3
CVS commit: src/compat/mips64
Module Name:src Committed By: uebayasi Date: Mon Dec 14 13:43:59 UTC 2009 Modified Files: src/compat/mips64/64: bsd.64.mk src/compat/mips64/o32: bsd.o32.mk Log Message: Use GNU linker emul names which really exist. XXX Assume big endian for now. Better than build failure. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/compat/mips64/64/bsd.64.mk cvs rdiff -u -r1.1 -r1.2 src/compat/mips64/o32/bsd.o32.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/compat/mips64/64/bsd.64.mk diff -u src/compat/mips64/64/bsd.64.mk:1.1 src/compat/mips64/64/bsd.64.mk:1.2 --- src/compat/mips64/64/bsd.64.mk:1.1 Sun Dec 13 09:07:32 2009 +++ src/compat/mips64/64/bsd.64.mk Mon Dec 14 13:43:59 2009 @@ -1,6 +1,6 @@ -# $NetBSD: bsd.64.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $ +# $NetBSD: bsd.64.mk,v 1.2 2009/12/14 13:43:59 uebayasi Exp $ -LD+= -m elf64_mipsn64 +LD+= -m elf64btsmip # XXX endian MLIBDIR= 64 COPTS+= -mabi=64 Index: src/compat/mips64/o32/bsd.o32.mk diff -u src/compat/mips64/o32/bsd.o32.mk:1.1 src/compat/mips64/o32/bsd.o32.mk:1.2 --- src/compat/mips64/o32/bsd.o32.mk:1.1 Sun Dec 13 09:07:32 2009 +++ src/compat/mips64/o32/bsd.o32.mk Mon Dec 14 13:43:59 2009 @@ -1,6 +1,6 @@ -# $NetBSD: bsd.o32.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $ +# $NetBSD: bsd.o32.mk,v 1.2 2009/12/14 13:43:59 uebayasi Exp $ -LD+= -m elf32_mipso32 +LD+= -m elf32btsmip # XXX endian MLIBDIR= o32 COPTS+= -mabi=32 -march=mips3
CVS commit: src/compat
Module Name:src
Committed By: snj
Date: Sun Dec 13 17:58:27 UTC 2009
Modified Files:
src/compat: README
Log Message:
Fix a few typos.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/compat/README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/README
diff -u src/compat/README:1.4 src/compat/README:1.5
--- src/compat/README:1.4 Sun Dec 13 09:27:57 2009
+++ src/compat/README Sun Dec 13 17:58:27 2009
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.4 2009/12/13 09:27:57 mrg Exp $
+$NetBSD: README,v 1.5 2009/12/13 17:58:27 snj Exp $
Building multi- ABI libraries for NetBSD platforms.
@@ -6,7 +6,7 @@
src/compat has a framework to (re)build the libraries shipped with
NetBSD for a different ABI than the default for that platform. This
-allow 32-bit libraries for the amd64 and sparc64 ports, and enables
+allows 32-bit libraries for the amd64 and sparc64 ports, and enables
the mips64 port to support all three of old-style 32-bit ("o32"), the
new 32-bit (default, "n32", 64-bit CPU required) or the 64-bit ABI.
@@ -16,7 +16,7 @@
of options. Each platform wanting support should create their port
subdirectory directly in src/compat, and then one subdirectory in here
for each ABI required. e.g., src/compat/amd64/i386 is where we build
-the 32-bit compat libraries for the amd64port. In each of these
+the 32-bit compat libraries for the amd64 port. In each of these
subdirs, a small Makefile and makefile fragment should exist. The
Makefile should set BSD_MK_COMPAT_FILE to equal the fragment, and then
include "../../Makefile.common". Eg, amd64/i386/Makefile has:
@@ -28,7 +28,7 @@
In the makefile fragment any changes to ABI flags are passed here
and the MLIBDIR variable must be set to the subdirectory in /usr/lib
where libraries for the ABI will be installed. There are a couple of
-helper Makefile's around. amd64/i386/bsd.i386.mk looks like:
+helper Makefiles around. amd64/i386/bsd.i386.mk looks like:
LD+= -m elf_i386
MLIBDIR= i386
CVS commit: src/compat
Module Name:src Committed By: mrg Date: Sun Dec 13 09:33:25 UTC 2009 Removed Files: src/compat: build-makefiles src/compat/crypto/external/bsd/netpgp/lib: Makefile src/compat/crypto/external/bsd/openssh/lib: Makefile src/compat/crypto/external/bsd/openssl/lib: Makefile src/compat/crypto/external/bsd/openssl/lib/libcrypto: Makefile src/compat/crypto/external/bsd/openssl/lib/libcrypto_idea: Makefile src/compat/crypto/external/bsd/openssl/lib/libcrypto_mdc2: Makefile src/compat/crypto/external/bsd/openssl/lib/libcrypto_rc5: Makefile src/compat/crypto/external/bsd/openssl/lib/libdes: Makefile src/compat/crypto/external/bsd/openssl/lib/libssl: Makefile src/compat/crypto/external/lib: Makefile src/compat/external/bsd/atf/lib: Makefile src/compat/external/bsd/atf/lib/libatf-c: Makefile src/compat/external/bsd/atf/lib/libatf-c++: Makefile src/compat/external/bsd/bind/lib: Makefile Makefile.inc src/compat/external/bsd/bind/lib/libbind9: Makefile src/compat/external/bsd/bind/lib/libdns: Makefile src/compat/external/bsd/bind/lib/libisc: Makefile src/compat/external/bsd/bind/lib/libisccc: Makefile src/compat/external/bsd/bind/lib/libisccfg: Makefile src/compat/external/bsd/bind/lib/liblwres: Makefile src/compat/external/bsd/file/lib: Makefile src/compat/external/bsd/flex/lib: Makefile src/compat/external/bsd/iscsi/lib: Makefile src/compat/external/bsd/libevent: Makefile Makefile.inc src/compat/external/bsd/libevent/include: Makefile src/compat/external/bsd/libevent/lib: Makefile src/compat/external/bsd/openldap/lib: Makefile src/compat/external/bsd/openldap/lib/liblber: Makefile src/compat/external/bsd/openldap/lib/libldap: Makefile src/compat/external/bsd/openldap/lib/libldap_r: Makefile src/compat/external/bsd/openldap/lib/liblutil: Makefile src/compat/external/gpl3/binutils/lib: Makefile src/compat/external/gpl3/binutils/lib/libbfd: Makefile src/compat/external/gpl3/binutils/lib/libiberty: Makefile src/compat/external/gpl3/binutils/lib/libopcodes: Makefile src/compat/external/lib: Makefile src/compat/gnu/lib: Makefile src/compat/gnu/lib/crtstuff4: Makefile src/compat/gnu/lib/libbfd: Makefile src/compat/gnu/lib/libgcc4: Makefile Makefile.inc src/compat/gnu/lib/libgcc4/libgcc: Makefile src/compat/gnu/lib/libgcc4/libgcc_eh: Makefile src/compat/gnu/lib/libgcc4/libgcc_s: Makefile src/compat/gnu/lib/libgcc4/libgcov: Makefile src/compat/gnu/lib/libiberty: Makefile src/compat/gnu/lib/libmalloc: Makefile src/compat/gnu/lib/libobjc4: Makefile src/compat/gnu/lib/libopcodes: Makefile src/compat/gnu/lib/libstdc++-v3_4: Makefile src/compat/gnu/lib/libstdc++-v3_4/include: Makefile src/compat/gnu/lib/libsupc++4: Makefile src/compat/lib: Makefile Makefile.inc src/compat/lib/csu: Makefile Makefile.real src/compat/lib/csu/i386_elf: Makefile crt0.c src/compat/lib/csu/sparc_elf: Makefile crt0.c src/compat/lib/i18n_module: Makefile Makefile.inc src/compat/lib/i18n_module/BIG5: Makefile src/compat/lib/i18n_module/DECHanyu: Makefile src/compat/lib/i18n_module/EUC: Makefile src/compat/lib/i18n_module/EUCTW: Makefile src/compat/lib/i18n_module/GBK2K: Makefile src/compat/lib/i18n_module/HZ: Makefile src/compat/lib/i18n_module/ISO2022: Makefile src/compat/lib/i18n_module/JOHAB: Makefile src/compat/lib/i18n_module/MSKanji: Makefile src/compat/lib/i18n_module/UES: Makefile src/compat/lib/i18n_module/UTF1632: Makefile src/compat/lib/i18n_module/UTF7: Makefile src/compat/lib/i18n_module/UTF8: Makefile src/compat/lib/i18n_module/VIQR: Makefile src/compat/lib/i18n_module/ZW: Makefile src/compat/lib/i18n_module/iconv_none: Makefile src/compat/lib/i18n_module/iconv_std: Makefile src/compat/lib/i18n_module/mapper_646: Makefile src/compat/lib/i18n_module/mapper_none: Makefile src/compat/lib/i18n_module/mapper_parallel: Makefile src/compat/lib/i18n_module/mapper_serial: Makefile src/compat/lib/i18n_module/mapper_std: Makefile src/compat/lib/i18n_module/mapper_zone: Makefile src/compat/lib/libarch: Makefile src/compat/lib/libasn1: Makefile src/compat/lib/libbind9: Makefile src/compat/lib/libbluetooth: Makefile src/compat/lib/libbsdmalloc: Makefile src/compat/lib/libbz2: Makefile src/compat/lib/libc: Makefile Makefile.inc src/compat/lib/libcom_err: Makefile src/compat/lib/libcompat: Makefile src/compat/lib/libcrypt: Makefile
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Sun Dec 13 09:27:57 UTC 2009
Modified Files:
src/compat: README
Log Message:
update this to reflect all the changes in src/compat version 2.0
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/compat/README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/README
diff -u src/compat/README:1.3 src/compat/README:1.4
--- src/compat/README:1.3 Tue Jan 13 17:52:32 2009
+++ src/compat/README Sun Dec 13 09:27:57 2009
@@ -1,43 +1,72 @@
-$NetBSD: README,v 1.3 2009/01/13 17:52:32 jmmv Exp $
+$NetBSD: README,v 1.4 2009/12/13 09:27:57 mrg Exp $
-This directory contains Makefile fragments that will build all of the
-NetBSD libraries in 32-bit mode and install them into /usr/lib/
-and also install a /usr/libexec/ld.elf_so-.
-This is current only supported for the amd64 and sparc64 platforms,
-where is "i386" or "sparc" respectively. (It could be used to
-build MIPS o32 libraries on n32 system, but not both n32 and o32 on
-a n64 system. It only supports one extra target.)
+Building multi- ABI libraries for NetBSD platforms.
-Most of the makefiles here were built with the "build-makefiles" script.
-The exceptions are lib/csu/Makefile and ld.elf_so/Makefile.
+src/compat has a framework to (re)build the libraries shipped with
+NetBSD for a different ABI than the default for that platform. This
+allow 32-bit libraries for the amd64 and sparc64 ports, and enables
+the mips64 port to support all three of old-style 32-bit ("o32"), the
+new 32-bit (default, "n32", 64-bit CPU required) or the 64-bit ABI.
-The method used is the:
- - evaluate some local variables
- - switch .CURDIR
- - include original Makefile,
- - evaluate some variables
- - switch .CURDIR back
-that is used by crunchgen to build eg, installer media or /rescue.
+The basic premise is to re-set $MAKEOBJDIRPREFIX to fresh subdirectory
+underneath src/compat and rebuild the libraries with a different set
+of options. Each platform wanting support should create their port
+subdirectory directly in src/compat, and then one subdirectory in here
+for each ABI required. e.g., src/compat/amd64/i386 is where we build
+the 32-bit compat libraries for the amd64port. In each of these
+subdirs, a small Makefile and makefile fragment should exist. The
+Makefile should set BSD_MK_COMPAT_FILE to equal the fragment, and then
+include "../../Makefile.common". Eg, amd64/i386/Makefile has:
+ BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.i386.mk
+ .include "../../Makefile.common"
-TODO:
- - some yacc issue -- libc, libipsec and libpcap need "make" run
- to generate headers properly, otherwise it complains about
- no way to get to foo.h. this is currently hacked by putting
- a rule "foo.h: foo.c" in the (generated) makefiles
- - there's an ugly hack to make libpam build correctly again the
- right libc. ld.elf_so has a similar (but less ugly hack)
- - not sure that /usr/lib/{i386,sparc}{,/i18n} are created
- properly yet
+In the makefile fragment any changes to ABI flags are passed here
+and the MLIBDIR variable must be set to the subdirectory in /usr/lib
+where libraries for the ABI will be installed. There are a couple of
+helper Makefile's around. amd64/i386/bsd.i386.mk looks like:
-Future work
+ LD+= -m elf_i386
+ MLIBDIR= i386
+ LIBC_MACHINE_ARCH= ${MLIBDIR}
+ COMMON_MACHINE_ARCH= ${MLIBDIR}
+ KVM_MACHINE_ARCH= ${MLIBDIR}
+ PTHREAD_MACHINE_ARCH= ${MLIBDIR}
+ BFD_MACHINE_ARCH= ${MLIBDIR}
+ CSU_MACHINE_ARCH= ${MLIBDIR}
+ CRYPTO_MACHINE_CPU= ${MLIBDIR}
+ LDELFSO_MACHINE_CPU= ${MLIBDIR}
-Ideally this should be able to handle any number of compat targets.
-Perhaps using a "force MAKEOBJDIR, and run-run make" solution will
-work, but my initial attempts got me no where. If not, perhaps
-build-makefiles could be expanded to be used at run-time in such
-a per-compat target obj-dir.
+ .include "${NETBSDSRCDIR}/compat/Makefile.m32"
+
+and the referenced Makefile.m32 looks like:
+
+ COPTS+= -m32
+ CPUFLAGS+= -m32
+ LDADD+= -m32
+ LDFLAGS+= -m32
+ MKDEPFLAGS+= -m32
+
+ .include "Makefile.compat"
+
+
+Makefile.common holds the list of subdirectories (the libraries and
+ld.elf_so) to build with this ABI.
+
+Makefile.md_subdir holds the list of subdirectories for each port.
+
+Makefile.compat has the basic framework to force the right paths for
+library and ld.elf_so linkage. It contains a hack to create subdirs
+in the build that should be fixed.
+
+dirshack/Makefile is a hack to get objdirs created timely, and should
+be fixed in a better way.
+
+
+
+...@eterna.com.au
+december 2009
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Sun Dec 13 09:27:34 UTC 2009
Modified Files:
src/compat: Makefile.compat
Added Files:
src/compat: m32.mk
Log Message:
- move -m32 style compat into "m32.mk"
- new Makefile.compat has mostly only the basics now
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/Makefile.compat
cvs rdiff -u -r0 -r1.1 src/compat/m32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile.compat
diff -u src/compat/Makefile.compat:1.6 src/compat/Makefile.compat:1.7
--- src/compat/Makefile.compat:1.6 Sun Dec 13 08:25:20 2009
+++ src/compat/Makefile.compat Sun Dec 13 09:27:34 2009
@@ -1,58 +1,33 @@
-# $NetBSD: Makefile.compat,v 1.6 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.compat,v 1.7 2009/12/13 09:27:34 mrg Exp $
-COPTS+= -m32
-CPUFLAGS+= -m32
-LDADD+= -m32
-MKDEPFLAGS+= -m32
-
-# XXX ugly
-.if ${MACHINE_ARCH} == "sparc64"
-LD+= -m elf32_sparc
-MLIBDIR= sparc
-.elif ${MACHINE_ARCH} == "x86_64"
-LD+= -m elf_i386
-MLIBDIR= i386
-.endif
+#
+# Makefile fragment to help implement a multilib set of libraries
+#
+# expects MLIBDIR to be set to the extra path component
+#
+
+.ifndef _COMPAT_OPTIONS_MK_ # {
+_COMPAT_OPTIONS_MK_=1
LIBDIR= /usr/lib/${MLIBDIR}
SHLIBDIR= /usr/lib/${MLIBDIR}
SHLIBINSTALLDIR= /usr/lib/${MLIBDIR}
-COMMON_MACHINE_ARCH= ${MLIBDIR}
-LIBC_MACHINE_ARCH= ${MLIBDIR}
-BFD_MACHINE_ARCH= ${MLIBDIR}
-CRYPTO_MACHINE_CPU= ${MLIBDIR}
-KVM_MACHINE_ARCH= ${MLIBDIR}
-PTHREAD_MACHINE_ARCH= ${MLIBDIR}
-LDELFSO_MACHINE_CPU= ${MLIBDIR}
-
-_GCC_CRTBEGIN?= ${DESTDIR}/usr/lib/${MLIBDIR}/crtbegin.o
-_GCC_CRTBEGINS?= ${DESTDIR}/usr/lib/${MLIBDIR}/crtbeginS.o
-_GCC_CRTEND?= ${DESTDIR}/usr/lib/${MLIBDIR}/crtend.o
-_GCC_CRTENDS?= ${DESTDIR}/usr/lib/${MLIBDIR}/crtendS.o
-_GCC_CRTDIR?= ${DESTDIR}/usr/lib/${MLIBDIR}
-_GCC_LIBGCCDIR?= ${DESTDIR}/usr/lib/${MLIBDIR}
+_GCC_CRTBEGIN= ${DESTDIR}/usr/lib/${MLIBDIR}/crtbegin.o
+_GCC_CRTBEGINS= ${DESTDIR}/usr/lib/${MLIBDIR}/crtbeginS.o
+_GCC_CRTEND= ${DESTDIR}/usr/lib/${MLIBDIR}/crtend.o
+_GCC_CRTENDS= ${DESTDIR}/usr/lib/${MLIBDIR}/crtendS.o
+_GCC_CRTDIR= ${DESTDIR}/usr/lib/${MLIBDIR}
+_GCC_LIBGCCDIR= ${DESTDIR}/usr/lib/${MLIBDIR}
NOSHARE= # defined
-NONLS= # defined
+NOLINT= # defined
+NONLS= # defined
+NOMAN= # defined
+NOINFO= # defined
NOCHECKVER= # defined
-LIBC_DIR= ${NETBSDSRCDIR}/compat/lib/libc
-
# ld.elf_so
SHLINKINSTALLDIR= /libexec
-# XXX
-EXTRALIBDIRS= ${DESTDIR}${LIBDIR} ${DESTDIR}${LIBDIR}/i18n ${DESTDIR}${LIBDIR}/security
-.PRECIOUS: ${EXTRALIBDIRS}
-install: ${EXTRALIBDIRS} .WAIT
-${EXTRALIBDIRS}: .EXEC
- @if [ ! -d ${.TARGET} ] ; then \
- ${_MKSHMSG_CREATE} ${.TARGET}; \
- ${_MKSHECHO} ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
- ${.TARGET}; \
- ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
- ${.TARGET}; \
- fi
-# Make sure the base dir is created first.
-${DESTDIR}${LIBDIR}/i18n ${DESTDIR}${LIBDIR}/security: ${DESTDIR}${LIBDIR}
+.endif # _COMPAT_OPTIONS_MK_ }
Added files:
Index: src/compat/m32.mk
diff -u /dev/null src/compat/m32.mk:1.1
--- /dev/null Sun Dec 13 09:27:34 2009
+++ src/compat/m32.mk Sun Dec 13 09:27:34 2009
@@ -0,0 +1,13 @@
+# $NetBSD: m32.mk,v 1.1 2009/12/13 09:27:34 mrg Exp $
+
+#
+# Makefile fragment to help implement a set of 'cc -m32' libraries.
+#
+
+COPTS+= -m32
+CPUFLAGS+= -m32
+LDADD+= -m32
+LDFLAGS+= -m32
+MKDEPFLAGS+= -m32
+
+.include "Makefile.compat"
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Sun Dec 13 09:27:13 UTC 2009
Modified Files:
src/compat: Makefile
Added Files:
src/compat: archdirs.mk compatsubdir.mk
Log Message:
- 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
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/compat/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/archdirs.mk src/compat/compatsubdir.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile
diff -u src/compat/Makefile:1.4 src/compat/Makefile:1.5
--- src/compat/Makefile:1.4 Sun Jun 7 22:59:22 2009
+++ src/compat/Makefile Sun Dec 13 09:27:13 2009
@@ -1,29 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2009/06/07 22:59:22 christos Exp $
+# $NetBSD: Makefile,v 1.5 2009/12/13 09:27:13 mrg Exp $
-# Build 32-bit compat versions of:
-# src/gnu/lib/libgcc4 into ${DESTDIR}/usr/lib/<32arch>
-# src/lib/libc into ${DESTDIR}/usr/lib/<32arch>
-# src/gnu/lib/ into ${DESTDIR}/usr/lib/<32arch>
-# src/lib/ into ${DESTDIR}/usr/lib/<32arch>
-# src/libexec/ld.elf_so into ${DESTDIR}/usr/libexec/ld.elf_so-<32arch>
+# Build multi-abi libaries
.include
-.if ${MKCOMPAT} != "no" && \
-(${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64")
-
+.if ${MKCOMPAT} != "no"
.if !make(includes)
-SUBDIR= gnu/lib/crtstuff4 .WAIT \
- lib/csu .WAIT \
- gnu/lib/libgcc4 .WAIT \
- lib/libc .WAIT \
- lib/libutil .WAIT \
- lib gnu/lib .WAIT \
- external/lib .WAIT \
- crypto/external/lib .WAIT \
- libexec/ld.elf_so
-.endif
+.include "archdirs.mk"
+
+SUBDIR= dirshack .WAIT ${ARCHDIR_SUBDIR}
+
+.endif
.endif
.include
Added files:
Index: src/compat/archdirs.mk
diff -u /dev/null src/compat/archdirs.mk:1.1
--- /dev/null Sun Dec 13 09:27:13 2009
+++ src/compat/archdirs.mk Sun Dec 13 09:27:13 2009
@@ -0,0 +1,15 @@
+# $NetBSD: archdirs.mk,v 1.1 2009/12/13 09:27:13 mrg Exp $
+
+# list of subdirs used per-platform
+
+.if ${MACHINE} == "sparc64"
+ARCHDIR_SUBDIR= sparc64/sparc
+.endif
+
+.if ${MACHINE} == "amd64"
+ARCHDIR_SUBDIR= amd64/i386
+.endif
+
+.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
+ARCHDIR_SUBDIR= mips64/64 mips64/o32
+.endif
Index: src/compat/compatsubdir.mk
diff -u /dev/null src/compat/compatsubdir.mk:1.1
--- /dev/null Sun Dec 13 09:27:13 2009
+++ src/compat/compatsubdir.mk Sun Dec 13 09:27:13 2009
@@ -0,0 +1,39 @@
+# $NetBSD: compatsubdir.mk,v 1.1 2009/12/13 09:27:13 mrg 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 \
+ ../../../external/bsd/atf/lib \
+ ../../../external/bsd/bind/lib \
+ ../../../external/bsd/libevent/lib \
+ ../../../external/bsd/file/lib \
+ ../../../external/bsd/openldap/lib \
+ ../../../external/gpl3/binutils/lib \
+ ../../../libexec/ld.elf_so
+.endif
+
+.include
+
+.endif
+.endif
CVS commit: src/compat/dirshack
Module Name:src
Committed By: mrg
Date: Sun Dec 13 09:25:57 UTC 2009
Added Files:
src/compat/dirshack: Makefile
Log Message:
a hack to force the top-level compat objdir to be created before the
library ones are. the Makefile has a long description of what's
really going on here.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/dirshack/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/compat/dirshack/Makefile
diff -u /dev/null src/compat/dirshack/Makefile:1.1
--- /dev/null Sun Dec 13 09:25:57 2009
+++ src/compat/dirshack/Makefile Sun Dec 13 09:25:57 2009
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2009/12/13 09:25:57 mrg Exp $
+
+# hacky method to get compat multilib base objdirs created before
+# make tries to go create the subdirs used for builds.
+
+# the problem is that make handles objdir creation for subdirs before it
+# handles this current directory, so when make cd's into $arch/$libtype
+# and from there into the ../../lib dirs, it ends up setting the forced
+# MAKEOBJDIRPREFIX to something based upon ${.CURDIR}, since the objdir
+# doesn't exist yet.
+#
+# our solution is simple - from this Makefile we traverse the same list
+# of $arch/$libtype's with "BOOTSTRAP_SUBDIR=". then the compat/Makefile
+# handles these subdirs as normal, with the base objdir created.
+
+.include
+
+.if ${MKCOMPAT} != "no"
+.if make(obj)
+
+.include "../archdirs.mk"
+
+MAKEDIRTARGETENV= BOOTSTRAP_SUBDIRS=
+
+SUBDIR= ${ARCHDIR_SUBDIR:C/^/..\//}
+
+.endif # make(obj)
+.endif # MKCOMPAT != no
+
+.include
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Sun Dec 13 09:07:33 UTC 2009
Added Files:
src/compat/amd64/i386: Makefile bsd.i386.mk
src/compat/mips64/64: Makefile bsd.64.mk
src/compat/mips64/o32: Makefile bsd.o32.mk
src/compat/sparc64/sparc: Makefile bsd.sparc.mk
Log Message:
for each $MACHINE_ARCH we have compat libraries to build for, give a list
of ABIs to target. for amd64 and sparc64, we use the old i386 and sparc
subdirectories. for mips64, we build both o32 and n64 libraries.
these files are not yet used, but will be shortly.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/amd64/i386/Makefile \
src/compat/amd64/i386/bsd.i386.mk
cvs rdiff -u -r0 -r1.1 src/compat/mips64/64/Makefile \
src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r0 -r1.1 src/compat/mips64/o32/Makefile \
src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r0 -r1.1 src/compat/sparc64/sparc/Makefile \
src/compat/sparc64/sparc/bsd.sparc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/compat/amd64/i386/Makefile
diff -u /dev/null src/compat/amd64/i386/Makefile:1.1
--- /dev/null Sun Dec 13 09:07:33 2009
+++ src/compat/amd64/i386/Makefile Sun Dec 13 09:07:32 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/12/13 09:07:32 mrg Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.i386.mk
+
+.include "../../compatsubdir.mk"
Index: src/compat/amd64/i386/bsd.i386.mk
diff -u /dev/null src/compat/amd64/i386/bsd.i386.mk:1.1
--- /dev/null Sun Dec 13 09:07:33 2009
+++ src/compat/amd64/i386/bsd.i386.mk Sun Dec 13 09:07:32 2009
@@ -0,0 +1,14 @@
+# $NetBSD: bsd.i386.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $
+
+LD+= -m elf_i386
+MLIBDIR= i386
+LIBC_MACHINE_ARCH= ${MLIBDIR}
+COMMON_MACHINE_ARCH= ${MLIBDIR}
+KVM_MACHINE_ARCH= ${MLIBDIR}
+PTHREAD_MACHINE_ARCH= ${MLIBDIR}
+BFD_MACHINE_ARCH= ${MLIBDIR}
+CSU_MACHINE_ARCH= ${MLIBDIR}
+CRYPTO_MACHINE_CPU= ${MLIBDIR}
+LDELFSO_MACHINE_CPU= ${MLIBDIR}
+
+.include "${NETBSDSRCDIR}/compat/m32.mk"
Index: src/compat/mips64/64/Makefile
diff -u /dev/null src/compat/mips64/64/Makefile:1.1
--- /dev/null Sun Dec 13 09:07:33 2009
+++ src/compat/mips64/64/Makefile Sun Dec 13 09:07:32 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/12/13 09:07:32 mrg Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.64.mk
+
+.include "../../compatsubdir.mk"
Index: src/compat/mips64/64/bsd.64.mk
diff -u /dev/null src/compat/mips64/64/bsd.64.mk:1.1
--- /dev/null Sun Dec 13 09:07:33 2009
+++ src/compat/mips64/64/bsd.64.mk Sun Dec 13 09:07:32 2009
@@ -0,0 +1,12 @@
+# $NetBSD: bsd.64.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $
+
+LD+= -m elf64_mipsn64
+MLIBDIR= 64
+
+COPTS+= -mabi=64
+CPUFLAGS+= -mabi=64
+LDADD+= -mabi=64
+LDFLAGS+= -mabi=64
+MKDEPFLAGS+= -mabi=64
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
Index: src/compat/mips64/o32/Makefile
diff -u /dev/null src/compat/mips64/o32/Makefile:1.1
--- /dev/null Sun Dec 13 09:07:33 2009
+++ src/compat/mips64/o32/Makefile Sun Dec 13 09:07:32 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/12/13 09:07:32 mrg Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.o32.mk
+
+.include "../../compatsubdir.mk"
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u /dev/null src/compat/mips64/o32/bsd.o32.mk:1.1
--- /dev/null Sun Dec 13 09:07:33 2009
+++ src/compat/mips64/o32/bsd.o32.mk Sun Dec 13 09:07:32 2009
@@ -0,0 +1,12 @@
+# $NetBSD: bsd.o32.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $
+
+LD+= -m elf32_mipso32
+MLIBDIR= o32
+
+COPTS+= -mabi=32 -march=mips3
+CPUFLAGS+= -mabi=32 -march=mips3
+LDADD+= -mabi=32 -march=mips3
+LDFLAGS+= -mabi=32 -march=mips3
+MKDEPFLAGS+= -mabi=32 -march=mips3
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
Index: src/compat/sparc64/sparc/Makefile
diff -u /dev/null src/compat/sparc64/sparc/Makefile:1.1
--- /dev/null Sun Dec 13 09:07:33 2009
+++ src/compat/sparc64/sparc/Makefile Sun Dec 13 09:07:32 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/12/13 09:07:32 mrg Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.sparc.mk
+
+.include "../../compatsubdir.mk"
Index: src/compat/sparc64/sparc/bsd.sparc.mk
diff -u /dev/null src/compat/sparc64/sparc/bsd.sparc.mk:1.1
--- /dev/null Sun Dec 13 09:07:33 2009
+++ src/compat/sparc64/sparc/bsd.sparc.mk Sun Dec 13 09:07:32 2009
@@ -0,0 +1,14 @@
+# $NetBSD: bsd.sparc.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $
+
+LD+= -m elf32_sparc
+MLIBDIR= sparc
+LIBC_MACHINE_ARCH= ${MLIBDIR}
+COMMON_MACHINE_ARCH= ${MLIBDIR}
+KVM_MACHINE_ARCH= ${MLIBDIR}
+PTHREAD_MACHINE_ARCH= ${MLIBDIR}
+BFD_MACHINE_ARCH= ${MLIBDIR}
+CSU_MACHINE_ARCH= ${MLIBDIR}
+CRYPTO_MACHINE_CPU= ${MLIBDIR}
+LDELFSO_MACHINE_CPU= ${MLIBDIR}
+
+.include "${NETBSDSRCDIR}/compat/m32.mk"
CVS commit: src/compat/external/gpl3/binutils/lib/libbfd
Module Name:src
Committed By: njoly
Date: Mon Nov 9 15:49:35 UTC 2009
Modified Files:
src/compat/external/gpl3/binutils/lib/libbfd: Makefile
Log Message:
Regen for NOLINKLIB.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/compat/external/gpl3/binutils/lib/libbfd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/compat/external/gpl3/binutils/lib/libbfd/Makefile:1.2 src/compat/external/gpl3/binutils/lib/libbfd/Makefile:1.3
--- src/compat/external/gpl3/binutils/lib/libbfd/Makefile:1.2 Fri Sep 11 22:36:39 2009
+++ src/compat/external/gpl3/binutils/lib/libbfd/Makefile Mon Nov 9 15:49:35 2009
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2009/09/11 22:36:39 mrg Exp $
-# Generated from: NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp
+# $NetBSD: Makefile,v 1.3 2009/11/09 15:49:35 njoly Exp $
+# Generated from: NetBSD: build-makefiles,v 1.10 2009/11/09 15:46:04 njoly Exp
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
+NOLINKLIB= # defined
LIBDPLIBS= z ${.CURDIR}/../../../../../lib/libz
NOCHECKVER= # defined
CVS commit: src/compat
Module Name:src
Committed By: njoly
Date: Mon Nov 9 15:46:04 UTC 2009
Modified Files:
src/compat: build-makefiles
Log Message:
- Add external/gpl3/binutils/lib to the directory list.
- libbfd require NOLINKLIB.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/compat/build-makefiles
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/build-makefiles
diff -u src/compat/build-makefiles:1.9 src/compat/build-makefiles:1.10
--- src/compat/build-makefiles:1.9 Mon Nov 2 10:13:19 2009
+++ src/compat/build-makefiles Mon Nov 9 15:46:04 2009
@@ -7,7 +7,7 @@
rwsrcdir=/home/current/src
MAKE=${MAKE-make}
-CHECK_SUBDIRS="gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules external/bsd/bind/lib external/bsd/iscsi external/bsd/libevent crypto/external/bsd/openssl/lib crypto/external/bsd/netpgp crypto/external/bsd/openssh"
+CHECK_SUBDIRS="gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules external/bsd/bind/lib external/bsd/iscsi external/bsd/libevent external/gpl3/binutils/lib crypto/external/bsd/openssl/lib crypto/external/bsd/netpgp crypto/external/bsd/openssh"
# lib/csu is spsecial
# lib/libm needs to be special -- i387
@@ -65,7 +65,7 @@
(
echo -n '# $Net'
echo 'BSD$'
- echo '# Generated from: $NetBSD: build-makefiles,v 1.9 2009/11/02 10:13:19 plunky Exp $' | sed -e 's/\$//g'
+ echo '# Generated from: $NetBSD: build-makefiles,v 1.10 2009/11/09 15:46:04 njoly Exp $' | sed -e 's/\$//g'
cat <<'EOF'
NOLINT= # defined
@@ -76,6 +76,9 @@
EOF
# XXX various hacks
case "${_sd}" in
+ libbfd)
+ echo "NOLINKLIB= # defined"
+ ;;
libsupc++4)
echo "NOPROFILE= # defined"
;;
CVS commit: src/compat/external/lib
Module Name:src
Committed By: christos
Date: Mon Oct 26 21:37:36 UTC 2009
Modified Files:
src/compat/external/lib: Makefile
Log Message:
hook lex
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.11 src/compat/external/lib/Makefile:1.12
--- src/compat/external/lib/Makefile:1.11 Mon Oct 26 00:10:39 2009
+++ src/compat/external/lib/Makefile Mon Oct 26 17:37:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/10/26 04:10:39 christos Exp $
+# $NetBSD: Makefile,v 1.12 2009/10/26 21:37:36 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -20,7 +20,7 @@
SUBDIR+= ../bsd/bind/lib
SUBDIR+= ../bsd/file/lib
-#SUBDIR+= ../bsd/flex/lib
+SUBDIR+= ../bsd/flex/lib
.if ${MKBINUTILS} != "no" && ${HAVE_BINUTILS} == "219"
SUBDIR+=../gpl3/binutils/lib
CVS commit: src/compat/external/lib
Module Name:src
Committed By: christos
Date: Mon Oct 26 04:10:39 UTC 2009
Modified Files:
src/compat/external/lib: Makefile
Log Message:
unhook flex for now
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.10 src/compat/external/lib/Makefile:1.11
--- src/compat/external/lib/Makefile:1.10 Sun Oct 25 21:22:41 2009
+++ src/compat/external/lib/Makefile Mon Oct 26 00:10:39 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/10/26 01:22:41 christos Exp $
+# $NetBSD: Makefile,v 1.11 2009/10/26 04:10:39 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -20,7 +20,7 @@
SUBDIR+= ../bsd/bind/lib
SUBDIR+= ../bsd/file/lib
-SUBDIR+= ../bsd/flex/lib
+#SUBDIR+= ../bsd/flex/lib
.if ${MKBINUTILS} != "no" && ${HAVE_BINUTILS} == "219"
SUBDIR+=../gpl3/binutils/lib
CVS commit: src/compat/external/lib
Module Name:src
Committed By: christos
Date: Mon Oct 26 01:22:41 UTC 2009
Modified Files:
src/compat/external/lib: Makefile
Log Message:
Add flex.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.9 src/compat/external/lib/Makefile:1.10
--- src/compat/external/lib/Makefile:1.9 Fri Sep 11 12:01:59 2009
+++ src/compat/external/lib/Makefile Sun Oct 25 21:22:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/09/11 16:01:59 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2009/10/26 01:22:41 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -20,6 +20,7 @@
SUBDIR+= ../bsd/bind/lib
SUBDIR+= ../bsd/file/lib
+SUBDIR+= ../bsd/flex/lib
.if ${MKBINUTILS} != "no" && ${HAVE_BINUTILS} == "219"
SUBDIR+=../gpl3/binutils/lib
CVS commit: src/compat/external/bsd/flex/lib
Module Name:src
Committed By: christos
Date: Mon Oct 26 01:22:12 UTC 2009
Added Files:
src/compat/external/bsd/flex/lib: Makefile
Log Message:
Add glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/flex/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/compat/external/bsd/flex/lib/Makefile
diff -u /dev/null src/compat/external/bsd/flex/lib/Makefile:1.1
--- /dev/null Sun Oct 25 21:22:12 2009
+++ src/compat/external/bsd/flex/lib/Makefile Sun Oct 25 21:22:11 2009
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2009/10/26 01:22:11 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+
+NOCHECKVER= # defined
+
+.include
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/external/bsd/flex/lib
+.CURDIR:=${NETBSDSRCDIR}/external/bsd/flex/lib
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
CVS commit: src/compat/external/gpl3/binutils/lib/libbfd
Module Name:src
Committed By: mrg
Date: Fri Sep 11 22:36:39 UTC 2009
Modified Files:
src/compat/external/gpl3/binutils/lib/libbfd: Makefile
Log Message:
"regenerate" this based on the non-compat version updating.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/compat/external/gpl3/binutils/lib/libbfd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/compat/external/gpl3/binutils/lib/libbfd/Makefile:1.1 src/compat/external/gpl3/binutils/lib/libbfd/Makefile:1.2
--- src/compat/external/gpl3/binutils/lib/libbfd/Makefile:1.1 Fri Sep 11 16:01:58 2009
+++ src/compat/external/gpl3/binutils/lib/libbfd/Makefile Fri Sep 11 22:36:39 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/09/11 16:01:58 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/11 22:36:39 mrg Exp $
# Generated from: NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp
NOLINT= # defined
@@ -6,6 +6,7 @@
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
+LIBDPLIBS= z ${.CURDIR}/../../../../../lib/libz
NOCHECKVER= # defined
CVS commit: src/compat/external/ibm-public/postfix/lib
Module Name:src Committed By: mrg Date: Tue Jul 21 01:06:03 UTC 2009 Removed Files: src/compat/external/ibm-public/postfix/lib: Makefile Makefile.inc src/compat/external/ibm-public/postfix/lib/dns: Makefile src/compat/external/ibm-public/postfix/lib/global: Makefile src/compat/external/ibm-public/postfix/lib/masterlib: Makefile src/compat/external/ibm-public/postfix/lib/milter: Makefile src/compat/external/ibm-public/postfix/lib/tls: Makefile src/compat/external/ibm-public/postfix/lib/util: Makefile src/compat/external/ibm-public/postfix/lib/xsasl: Makefile Log Message: do not need the postfix libraries here. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/compat/external/ibm-public/postfix/lib/Makefile \ src/compat/external/ibm-public/postfix/lib/Makefile.inc cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/dns/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/global/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/masterlib/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/milter/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/tls/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/util/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/xsasl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Tue Jul 21 01:05:35 UTC 2009
Modified Files:
src/compat: build-makefiles
Log Message:
do not need the postfix libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/compat/build-makefiles
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/build-makefiles
diff -u src/compat/build-makefiles:1.7 src/compat/build-makefiles:1.8
--- src/compat/build-makefiles:1.7 Tue Jul 21 00:23:02 2009
+++ src/compat/build-makefiles Tue Jul 21 01:05:35 2009
@@ -7,7 +7,7 @@
rwsrcdir=/home/current/src
MAKE=${MAKE-make}
-CHECK_SUBDIRS="gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules external/bsd/bind/lib external/ibm-public/postfix/lib external/bsd/iscsi crypto/external/bsd/openssl/lib crypto/external/bsd/netpgp crypto/external/bsd/openssh"
+CHECK_SUBDIRS="gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules external/bsd/bind/lib external/bsd/iscsi crypto/external/bsd/openssl/lib crypto/external/bsd/netpgp crypto/external/bsd/openssh"
# lib/csu is spsecial
# lib/libm needs to be special -- i387
@@ -65,7 +65,7 @@
(
echo -n '# $Net'
echo 'BSD$'
- echo '# Generated from: $NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp $' | sed -e 's/\$//g'
+ echo '# Generated from: $NetBSD: build-makefiles,v 1.8 2009/07/21 01:05:35 mrg Exp $' | sed -e 's/\$//g'
cat <<'EOF'
NOLINT= # defined
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Tue Jul 21 00:23:02 UTC 2009
Modified Files:
src/compat: build-makefiles
Log Message:
fix the generated from id.
don't generate some subdir makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/build-makefiles
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/build-makefiles
diff -u src/compat/build-makefiles:1.6 src/compat/build-makefiles:1.7
--- src/compat/build-makefiles:1.6 Tue Jul 21 00:12:00 2009
+++ src/compat/build-makefiles Tue Jul 21 00:23:02 2009
@@ -21,8 +21,13 @@
}
for _dir in ${CHECK_SUBDIRS}; do
+
+ # set this to true if the needs to be no master subdir Makefile
+ _need_no_subdir=false
+
if [ ${_dir} = "lib/csu" ]; then
_subdirs="i386_elf sparc_elf"
+ _need_no_subdir=true
else
_subdirs=`cd ${srcdir}/${_dir}; ${MAKE} -V SUBDIR`
fi
@@ -40,7 +45,7 @@
fi
# skip a bunch of non-lib subdirs --
- case "$_dir/$_sd" in
+ case "$_dir" in
external/bsd/fetch | \
external/bsd/file | \
external/bsd/iscsi | \
@@ -50,6 +55,7 @@
if [ "$_sd" != "lib" ]; then
continue;
fi
+ _need_no_subdir=true
esac
_libdplibs="`cd ${srcdir}/${_dir}/${_sd}; ${MAKE} -V LIBDPLIBS | sed 's,\({NETBSDSRCDIR}\),\1/compat,g'`"
@@ -59,7 +65,7 @@
(
echo -n '# $Net'
echo 'BSD$'
- echo '# Generated from: $NetBSD: build-makefiles,v 1.6 2009/07/21 00:12:00 mrg Exp $' | sed -e 's/$//g'
+ echo '# Generated from: $NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp $' | sed -e 's/\$//g'
cat <<'EOF'
NOLINT= # defined
@@ -125,7 +131,7 @@
) > ${rwsrcdir}/compat/${_dir}/${_sd}/Makefile
done
- if [ "${_dir}" != "lib/csu" ]; then
+ if [ "${_need_no_subdir}" != "true" ]; then
(printf '# $'NetBSD'$\n\n'
printf ".include \n\n"
printf "_CURDIR:= \${.CURDIR}\n\n"
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Tue Jul 21 00:12:00 UTC 2009
Modified Files:
src/compat: build-makefiles
Log Message:
bring this much closer to reality:
- add many subdirs of libs missing
- output a literal $NetBSD$ as well as the expanded version of this script
- special case a bunch of the external subdirs, since some of the library
subdirs exist in toplevel directory, not the "lib" directory
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/compat/build-makefiles
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/build-makefiles
diff -u src/compat/build-makefiles:1.5 src/compat/build-makefiles:1.6
--- src/compat/build-makefiles:1.5 Mon Jan 19 07:16:38 2009
+++ src/compat/build-makefiles Tue Jul 21 00:12:00 2009
@@ -7,11 +7,19 @@
rwsrcdir=/home/current/src
MAKE=${MAKE-make}
-CHECK_SUBDIRS="gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules"
+CHECK_SUBDIRS="gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules external/bsd/bind/lib external/ibm-public/postfix/lib external/bsd/iscsi crypto/external/bsd/openssl/lib crypto/external/bsd/netpgp crypto/external/bsd/openssh"
+
# lib/csu is spsecial
# lib/libm needs to be special -- i387
# gnu/lib/libsupc++ -- fails to get NOPROFILE properly
+tmpdir=`mktemp -d /var/tmp/build-makefiles-$$.XX` || exit 1
+
+write_if_new() {
+ _file="$1"
+ _new="$2"
+}
+
for _dir in ${CHECK_SUBDIRS}; do
if [ ${_dir} = "lib/csu" ]; then
_subdirs="i386_elf sparc_elf"
@@ -25,17 +33,34 @@
if [ "$_dir" = "lib" -a "$_sd" = "csu" ]; then
continue
fi
+
# skip .WAIT --
if [ "$_sd" = ".WAIT" ]; then
continue
fi
- _libdplibs="`cd ${srcdir}/${_dir}/${_sd}; ${MAKE} -V LIBDPLIBS`"
+
+ # skip a bunch of non-lib subdirs --
+ case "$_dir/$_sd" in
+ external/bsd/fetch | \
+ external/bsd/file | \
+ external/bsd/iscsi | \
+ external/bsd/libarchive | \
+ crypto/external/bsd/netpgp | \
+ crypto/external/bsd/openssh )
+ if [ "$_sd" != "lib" ]; then
+continue;
+ fi
+ esac
+
+ _libdplibs="`cd ${srcdir}/${_dir}/${_sd}; ${MAKE} -V LIBDPLIBS | sed 's,\({NETBSDSRCDIR}\),\1/compat,g'`"
echo "creating stuff for subdir: $_sd"
echo " - libdplibs = ${_libdplibs}"
mkdir -p ${rwsrcdir}/compat/${_dir}/${_sd}
(
+ echo -n '# $Net'
+ echo 'BSD$'
+ echo '# Generated from: $NetBSD: build-makefiles,v 1.6 2009/07/21 00:12:00 mrg Exp $' | sed -e 's/$//g'
cat <<'EOF'
-# $NetBSD: build-makefiles,v 1.5 2009/01/19 07:16:38 jmmv Exp $
NOLINT= # defined
NOMAN= # defined
@@ -77,6 +102,8 @@
${var}:=${${var}}
.endfor
+.include
+
_CURDIR:= ${.CURDIR}
EOF
@@ -98,8 +125,9 @@
) > ${rwsrcdir}/compat/${_dir}/${_sd}/Makefile
done
- if [ "${_dir}" = "lib" -a "${_sd}" = "csu" ]; then
+ if [ "${_dir}" != "lib/csu" ]; then
(printf '# $'NetBSD'$\n\n'
+ printf ".include \n\n"
printf "_CURDIR:= \${.CURDIR}\n\n"
printf ".CURDIR:=\${NETBSDSRCDIR}/${_dir}\n\n"
printf ".include "'"'"\${.CURDIR}/Makefile"'"'"\n\n"
@@ -108,10 +136,12 @@
if [ -f "${srcdir}/${_dir}/Makefile.inc" ]; then
(printf '# $'NetBSD'$\n\n'
+ printf ".include \n\n"
printf "_CURDIR:= \${.CURDIR}\n\n"
printf ".include "'"'"\${NETBSDSRCDIR}/${_dir}/Makefile.inc"'"'"\n\n"
printf ".CURDIR:= \${_CURDIR}\n"
) > ${rwsrcdir}/compat/${_dir}/Makefile.inc
fi
fi
+
done
CVS commit: src/compat/crypto/external/bsd/openssl/lib
Module Name:src
Committed By: christos
Date: Mon Jul 20 20:19:49 UTC 2009
Modified Files:
src/compat/crypto/external/bsd/openssl/lib: Makefile
Log Message:
reference the regular Makefile directly instead of copying it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/crypto/external/bsd/openssl/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/crypto/external/bsd/openssl/lib/Makefile
diff -u src/compat/crypto/external/bsd/openssl/lib/Makefile:1.1 src/compat/crypto/external/bsd/openssl/lib/Makefile:1.2
--- src/compat/crypto/external/bsd/openssl/lib/Makefile:1.1 Sun Jul 19 19:36:49 2009
+++ src/compat/crypto/external/bsd/openssl/lib/Makefile Mon Jul 20 16:19:48 2009
@@ -1,26 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/07/19 23:36:49 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/20 20:19:48 christos Exp $
.include "bsd.own.mk"
-.if (${MKCRYPTO} != "no")
-
-# OpenSSL libraries.
-SUBDIR= libcrypto libdes
-
-.if (${MKCRYPTO_IDEA} != "no")
-SUBDIR+= libcrypto_idea
-.endif # MKCRYPTO_IDEA != no
-
-.if (${MKCRYPTO_MDC2} != "no")
-SUBDIR+= libcrypto_mdc2
-.endif # MKCRYPTO_MDC2 != no
-
-.if (${MKCRYPTO_RC5} != "no")
-SUBDIR+= libcrypto_rc5
-.endif # MKCRYPTO_RC5 != no
-
-SUBDIR+= libssl # depends on libcrypto
-
-.endif # MKCRYPTO != no
-
-.include
+.include "${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/Makefile"
CVS commit: src/compat/lib
Module Name:src Committed By: christos Date: Sun Jul 19 23:37:31 UTC 2009 Removed Files: src/compat/lib/libcrypto: Makefile src/compat/lib/libcrypto_idea: Makefile src/compat/lib/libcrypto_mdc2: Makefile src/compat/lib/libcrypto_rc5: Makefile src/compat/lib/libdes: Makefile src/compat/lib/libssl: Makefile Log Message: OpenSSL has moved To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/compat/lib/libcrypto/Makefile cvs rdiff -u -r1.1 -r0 src/compat/lib/libcrypto_idea/Makefile cvs rdiff -u -r1.1 -r0 src/compat/lib/libcrypto_mdc2/Makefile cvs rdiff -u -r1.1 -r0 src/compat/lib/libcrypto_rc5/Makefile cvs rdiff -u -r1.4 -r0 src/compat/lib/libdes/Makefile cvs rdiff -u -r1.4 -r0 src/compat/lib/libssl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/compat/crypto/external/bsd/openssl/lib
Module Name:src
Committed By: christos
Date: Sun Jul 19 23:36:50 UTC 2009
Added Files:
src/compat/crypto/external/bsd/openssl/lib: Makefile
src/compat/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/compat/crypto/external/bsd/openssl/lib/libcrypto_idea: Makefile
src/compat/crypto/external/bsd/openssl/lib/libcrypto_mdc2: Makefile
src/compat/crypto/external/bsd/openssl/lib/libcrypto_rc5: Makefile
src/compat/crypto/external/bsd/openssl/lib/libdes: Makefile
src/compat/crypto/external/bsd/openssl/lib/libssl: Makefile
Log Message:
Add build glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/crypto/external/bsd/openssl/lib/Makefile
cvs rdiff -u -r0 -r1.1 \
src/compat/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r0 -r1.1 \
src/compat/crypto/external/bsd/openssl/lib/libcrypto_idea/Makefile
cvs rdiff -u -r0 -r1.1 \
src/compat/crypto/external/bsd/openssl/lib/libcrypto_mdc2/Makefile
cvs rdiff -u -r0 -r1.1 \
src/compat/crypto/external/bsd/openssl/lib/libcrypto_rc5/Makefile
cvs rdiff -u -r0 -r1.1 \
src/compat/crypto/external/bsd/openssl/lib/libdes/Makefile
cvs rdiff -u -r0 -r1.1 \
src/compat/crypto/external/bsd/openssl/lib/libssl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/compat/crypto/external/bsd/openssl/lib/Makefile
diff -u /dev/null src/compat/crypto/external/bsd/openssl/lib/Makefile:1.1
--- /dev/null Sun Jul 19 19:36:50 2009
+++ src/compat/crypto/external/bsd/openssl/lib/Makefile Sun Jul 19 19:36:49 2009
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2009/07/19 23:36:49 christos Exp $
+
+.include "bsd.own.mk"
+
+.if (${MKCRYPTO} != "no")
+
+# OpenSSL libraries.
+SUBDIR= libcrypto libdes
+
+.if (${MKCRYPTO_IDEA} != "no")
+SUBDIR+= libcrypto_idea
+.endif # MKCRYPTO_IDEA != no
+
+.if (${MKCRYPTO_MDC2} != "no")
+SUBDIR+= libcrypto_mdc2
+.endif # MKCRYPTO_MDC2 != no
+
+.if (${MKCRYPTO_RC5} != "no")
+SUBDIR+= libcrypto_rc5
+.endif # MKCRYPTO_RC5 != no
+
+SUBDIR+= libssl # depends on libcrypto
+
+.endif # MKCRYPTO != no
+
+.include
Index: src/compat/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u /dev/null src/compat/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.1
--- /dev/null Sun Jul 19 19:36:50 2009
+++ src/compat/crypto/external/bsd/openssl/lib/libcrypto/Makefile Sun Jul 19 19:36:49 2009
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2009/07/19 23:36:49 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+NOCHECKVER= # defined
+
+.include
+
+LIBDPLIBS= crypt ${NETBSDSRCDIR}/lib/libcrypt
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+.CURDIR:=${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
Index: src/compat/crypto/external/bsd/openssl/lib/libcrypto_idea/Makefile
diff -u /dev/null src/compat/crypto/external/bsd/openssl/lib/libcrypto_idea/Makefile:1.1
--- /dev/null Sun Jul 19 19:36:50 2009
+++ src/compat/crypto/external/bsd/openssl/lib/libcrypto_idea/Makefile Sun Jul 19 19:36:49 2009
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2009/07/19 23:36:49 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+NOPIC= # defined
+
+NOCHECKVER= # defined
+
+.include
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto_idea
+.CURDIR:=${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto_idea
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
Index: src/compat/crypto/external/bsd/openssl/lib/libcrypto_mdc2/Makefile
diff -u /dev/null src/compat/crypto/external/bsd/openssl/lib/libcrypto_mdc2/Makefile:1.1
--- /dev/null Sun Jul 19 19:36:50 2009
+++ src/compat/crypto/external
CVS commit: src/compat/lib/libpam/modules/pam_ssh
Module Name:src
Committed By: mrg
Date: Fri Jun 12 06:40:51 UTC 2009
Modified Files:
src/compat/lib/libpam/modules/pam_ssh: Makefile
Log Message:
catch up with libssh build dir move
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/compat/lib/libpam/modules/pam_ssh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/lib/libpam/modules/pam_ssh/Makefile
diff -u src/compat/lib/libpam/modules/pam_ssh/Makefile:1.3 src/compat/lib/libpam/modules/pam_ssh/Makefile:1.4
--- src/compat/lib/libpam/modules/pam_ssh/Makefile:1.3 Mon Oct 27 08:00:05 2008
+++ src/compat/lib/libpam/modules/pam_ssh/Makefile Fri Jun 12 06:40:51 2009
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2008/10/27 08:00:05 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 06:40:51 mrg Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= ssh ${.CURDIR}/../../../libssh crypt ${.CURDIR}/../../../libcrypt crypto ${.CURDIR}/../../../libcrypto
+LIBDPLIBS= ssh ${.CURDIR}/../../../../crypto/external/bsd/openssh/lib crypt ${.CURDIR}/../../../libcrypt crypto ${.CURDIR}/../../../libcrypto
NOCHECKVER= # defined
CVS commit: src/compat/external/lib
Module Name:src
Committed By: christos
Date: Wed Jun 10 12:48:06 UTC 2009
Modified Files:
src/compat/external/lib: Makefile
Log Message:
Revert my change again. Now I see what was wrong... My CVS files were corrupted.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.7 src/compat/external/lib/Makefile:1.8
--- src/compat/external/lib/Makefile:1.7 Tue Jun 9 21:11:50 2009
+++ src/compat/external/lib/Makefile Wed Jun 10 08:48:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/10 01:11:50 christos Exp $
+# $NetBSD: Makefile,v 1.8 2009/06/10 12:48:06 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -8,9 +8,17 @@
.include
+.if (${MKATF} != "no")
+SUBDIR+= ../bsd/atf/lib
+.endif
+
.if (${MKCRYPTO} != "no")
-SUBDIR+= ../bsd/netpgp/lib
-SUBDIR+= ../bsd/openssh/lib
+.if (${MKLDAP} != "no")
+SUBDIR+= ../bsd/openldap/lib
.endif
+.endif
+
+SUBDIR+= ../bsd/bind/lib
+SUBDIR+= ../bsd/file/lib
.include
CVS commit: src/compat/external/lib
Module Name:src
Committed By: christos
Date: Wed Jun 10 01:11:51 UTC 2009
Modified Files:
src/compat/external/lib: Makefile
Log Message:
reference the correct dirs.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.6 src/compat/external/lib/Makefile:1.7
--- src/compat/external/lib/Makefile:1.6 Sun Jun 7 21:22:53 2009
+++ src/compat/external/lib/Makefile Tue Jun 9 21:11:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/08 01:22:53 christos Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/10 01:11:50 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -8,17 +8,9 @@
.include
-.if (${MKATF} != "no")
-SUBDIR+= ../bsd/atf/lib
-.endif
-
.if (${MKCRYPTO} != "no")
-.if (${MKLDAP} != "no")
-SUBDIR+= ../bsd/openldap/lib
+SUBDIR+= ../bsd/netpgp/lib
+SUBDIR+= ../bsd/openssh/lib
.endif
-.endif
-
-SUBDIR+= ../bsd/bind/lib
-SUBDIR+= ../bsd/file/lib
.include
CVS commit: src/compat/crypto/external/bsd/openssh/lib
Module Name:src
Committed By: mrg
Date: Tue Jun 9 02:35:19 UTC 2009
Modified Files:
src/compat/crypto/external/bsd/openssh/lib: Makefile
Log Message:
remove a ../ from a few paths to make sure we get the right components.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/crypto/external/bsd/openssh/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/crypto/external/bsd/openssh/lib/Makefile
diff -u src/compat/crypto/external/bsd/openssh/lib/Makefile:1.1 src/compat/crypto/external/bsd/openssh/lib/Makefile:1.2
--- src/compat/crypto/external/bsd/openssh/lib/Makefile:1.1 Sun Jun 7 22:59:22 2009
+++ src/compat/crypto/external/bsd/openssh/lib/Makefile Tue Jun 9 02:35:19 2009
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2009/06/07 22:59:22 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/09 02:35:19 mrg Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= crypto ${.CURDIR}/../../../../../../lib/libcrypto \
- crypt ${.CURDIR}/../../../../../../lib/libcrypt \
- z ${.CURDIR}/../../../../../../lib/libz
+LIBDPLIBS= crypto ${.CURDIR}/../../../../../lib/libcrypto \
+ crypt ${.CURDIR}/../../../../../lib/libcrypt \
+ z ${.CURDIR}/../../../../../lib/libz
NOCHECKVER= # defined
CVS commit: src/compat/crypto/external/bsd/netpgp/lib
Module Name:src
Committed By: mrg
Date: Tue Jun 9 02:32:22 UTC 2009
Modified Files:
src/compat/crypto/external/bsd/netpgp/lib: Makefile
Log Message:
use the correct set of LIBDPLIBS.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/crypto/external/bsd/netpgp/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/crypto/external/bsd/netpgp/lib/Makefile
diff -u src/compat/crypto/external/bsd/netpgp/lib/Makefile:1.1 src/compat/crypto/external/bsd/netpgp/lib/Makefile:1.2
--- src/compat/crypto/external/bsd/netpgp/lib/Makefile:1.1 Mon Jun 8 15:39:43 2009
+++ src/compat/crypto/external/bsd/netpgp/lib/Makefile Tue Jun 9 02:32:22 2009
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2009/06/08 15:39:43 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/09 02:32:22 mrg Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= bz2 ${.CURDIR}/../../../../../../lib/libbz2 \
- crypt ${.CURDIR}/../../../../../../lib/libcrypt \
- z ${.CURDIR}/../../../../../../lib/libz
+LIBDPLIBS= crypto ${.CURDIR}/../../../../../lib/libcrypto \
+ z ${.CURDIR}/../../../../../lib/libz \
+ bz2 ${.CURDIR}/../../../../../lib/libbz2
NOCHECKVER= # defined
CVS commit: src/compat/crypto/external
Module Name:src
Committed By: mrg
Date: Mon Jun 8 15:39:44 UTC 2009
Added Files:
src/compat/crypto/external/bsd/netpgp/lib: Makefile
src/compat/crypto/external/lib: Makefile
Log Message:
fix PR/41557: fix src/compat build for 64 bit platforms by building
the 32 bit netpgp lib.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/crypto/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/compat/crypto/external/bsd/netpgp/lib/Makefile
diff -u /dev/null src/compat/crypto/external/bsd/netpgp/lib/Makefile:1.1
--- /dev/null Mon Jun 8 15:39:44 2009
+++ src/compat/crypto/external/bsd/netpgp/lib/Makefile Mon Jun 8 15:39:43 2009
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1 2009/06/08 15:39:43 mrg Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= bz2 ${.CURDIR}/../../../../../../lib/libbz2 \
+ crypt ${.CURDIR}/../../../../../../lib/libcrypt \
+ z ${.CURDIR}/../../../../../../lib/libz
+
+NOCHECKVER= # defined
+
+.include
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/crypto/external/bsd/netpgp/lib
+.CURDIR:= ${NETBSDSRCDIR}/crypto/external/bsd/netpgp/lib
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
Index: src/compat/crypto/external/lib/Makefile
diff -u /dev/null src/compat/crypto/external/lib/Makefile:1.1
--- /dev/null Mon Jun 8 15:39:44 2009
+++ src/compat/crypto/external/lib/Makefile Mon Jun 8 15:39:44 2009
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2009/06/08 15:39:44 mrg Exp $
+
+.include
+
+_CURDIR:= ${.CURDIR}
+
+.include
+.CURDIR:=${NETBSDSRCDIR}/crypto/external/lib
+
+.include "${.CURDIR}/Makefile"
+
+.CURDIR:= ${_CURDIR}
CVS commit: src/compat/external/lib
Module Name:src
Committed By: christos
Date: Mon Jun 8 01:22:53 UTC 2009
Modified Files:
src/compat/external/lib: Makefile
Log Message:
revert previous broken change
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.5 src/compat/external/lib/Makefile:1.6
--- src/compat/external/lib/Makefile:1.5 Sun Jun 7 18:59:22 2009
+++ src/compat/external/lib/Makefile Sun Jun 7 21:22:53 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/06/07 22:59:22 christos Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/08 01:22:53 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -8,8 +8,17 @@
.include
+.if (${MKATF} != "no")
+SUBDIR+= ../bsd/atf/lib
+.endif
+
.if (${MKCRYPTO} != "no")
-SUBDIR+= ../bsd/openssh/lib
+.if (${MKLDAP} != "no")
+SUBDIR+= ../bsd/openldap/lib
.endif
+.endif
+
+SUBDIR+= ../bsd/bind/lib
+SUBDIR+= ../bsd/file/lib
.include
CVS commit: src/compat
Module Name:src
Committed By: christos
Date: Sun Jun 7 22:59:23 UTC 2009
Modified Files:
src/compat: Makefile
src/compat/external/lib: Makefile
Added Files:
src/compat/crypto/external/bsd/openssh/lib: Makefile
Log Message:
glue in openssh
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/compat/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile
diff -u src/compat/Makefile:1.3 src/compat/Makefile:1.4
--- src/compat/Makefile:1.3 Tue Apr 14 13:51:57 2009
+++ src/compat/Makefile Sun Jun 7 18:59:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/14 17:51:57 christos Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/07 22:59:22 christos Exp $
# Build 32-bit compat versions of:
# src/gnu/lib/libgcc4 into ${DESTDIR}/usr/lib/<32arch>
@@ -20,6 +20,7 @@
lib/libutil .WAIT \
lib gnu/lib .WAIT \
external/lib .WAIT \
+ crypto/external/lib .WAIT \
libexec/ld.elf_so
.endif
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.4 src/compat/external/lib/Makefile:1.5
--- src/compat/external/lib/Makefile:1.4 Fri May 8 13:54:22 2009
+++ src/compat/external/lib/Makefile Sun Jun 7 18:59:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/08 17:54:22 christos Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/07 22:59:22 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -8,17 +8,8 @@
.include
-.if (${MKATF} != "no")
-SUBDIR+= ../bsd/atf/lib
-.endif
-
.if (${MKCRYPTO} != "no")
-.if (${MKLDAP} != "no")
-SUBDIR+= ../bsd/openldap/lib
+SUBDIR+= ../bsd/openssh/lib
.endif
-.endif
-
-SUBDIR+= ../bsd/bind/lib
-SUBDIR+= ../bsd/file/lib
.include
Added files:
Index: src/compat/crypto/external/bsd/openssh/lib/Makefile
diff -u /dev/null src/compat/crypto/external/bsd/openssh/lib/Makefile:1.1
--- /dev/null Sun Jun 7 18:59:23 2009
+++ src/compat/crypto/external/bsd/openssh/lib/Makefile Sun Jun 7 18:59:22 2009
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1 2009/06/07 22:59:22 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= crypto ${.CURDIR}/../../../../../../lib/libcrypto \
+ crypt ${.CURDIR}/../../../../../../lib/libcrypt \
+ z ${.CURDIR}/../../../../../../lib/libz
+
+NOCHECKVER= # defined
+
+.include
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/crypto/external/bsd/openssh/lib
+.CURDIR:= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/lib
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
CVS commit: src/compat
Module Name:src
Committed By: christos
Date: Tue May 19 20:27:50 UTC 2009
Modified Files:
src/compat: Makefile.compat
Log Message:
we need SHLINKINSTALLDIR to be /libexec for /bin and /sbin binaries.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/compat/Makefile.compat
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile.compat
diff -u src/compat/Makefile.compat:1.4 src/compat/Makefile.compat:1.5
--- src/compat/Makefile.compat:1.4 Thu Mar 12 13:16:58 2009
+++ src/compat/Makefile.compat Tue May 19 16:27:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.compat,v 1.4 2009/03/12 17:16:58 abs Exp $
+# $NetBSD: Makefile.compat,v 1.5 2009/05/19 20:27:50 christos Exp $
COPTS+= -m32
CPUFLAGS+= -m32
@@ -40,7 +40,7 @@
LIBC_DIR= ${NETBSDSRCDIR}/compat/lib/libc
# ld.elf_so
-SHLINKINSTALLDIR= /usr/libexec
+SHLINKINSTALLDIR= /libexec
# XXX
EXTRALIBDIRS= ${DESTDIR}${LIBDIR} ${DESTDIR}${LIBDIR}/i18n ${DESTDIR}${LIBDIR}/security
CVS commit: src/compat/libexec/ld.elf_so
Module Name:src
Committed By: christos
Date: Tue May 19 20:27:22 UTC 2009
Modified Files:
src/compat/libexec/ld.elf_so: Makefile
Log Message:
don't define SHLINKINSTALLDIR in 10 places. It is done in Makefile.compat
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/libexec/ld.elf_so/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/libexec/ld.elf_so/Makefile
diff -u src/compat/libexec/ld.elf_so/Makefile:1.6 src/compat/libexec/ld.elf_so/Makefile:1.7
--- src/compat/libexec/ld.elf_so/Makefile:1.6 Thu Feb 19 21:43:02 2009
+++ src/compat/libexec/ld.elf_so/Makefile Tue May 19 16:27:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/20 02:43:02 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 20:27:22 christos Exp $
NOMAN= # defined
@@ -7,8 +7,6 @@
.if ${MKPIC} != "no"
-SHLINKINSTALLDIR= /usr/libexec
-
LDFLAGS+= -m32
#CPPFLAGS+= -DDEBUG
CVS commit: src/compat/external/lib
Module Name:src Committed By: christos Date: Fri May 8 17:54:22 UTC 2009 Modified Files: src/compat/external/lib: Makefile Log Message: add glue for libmagic To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/compat/external/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/compat/external/lib/Makefile diff -u src/compat/external/lib/Makefile:1.3 src/compat/external/lib/Makefile:1.4 --- src/compat/external/lib/Makefile:1.3 Tue Apr 14 17:20:49 2009 +++ src/compat/external/lib/Makefile Fri May 8 13:54:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/04/14 21:20:49 christos Exp $ +# $NetBSD: Makefile,v 1.4 2009/05/08 17:54:22 christos Exp $ # # This Makefile exists to provide a single point to build @@ -19,5 +19,6 @@ .endif SUBDIR+= ../bsd/bind/lib +SUBDIR+= ../bsd/file/lib .include
CVS commit: src/compat/external/bsd/file/lib
Module Name:src
Committed By: christos
Date: Fri May 8 17:53:59 UTC 2009
Added Files:
src/compat/external/bsd/file/lib: Makefile
Log Message:
add compat glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/file/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/compat/external/bsd/file/lib/Makefile
diff -u /dev/null src/compat/external/bsd/file/lib/Makefile:1.1
--- /dev/null Fri May 8 13:53:59 2009
+++ src/compat/external/bsd/file/lib/Makefile Fri May 8 13:53:59 2009
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2009/05/08 17:53:59 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= z ${.CURDIR}/../../../../lib/libz
+
+NOCHECKVER= # defined
+
+.include
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/external/bsd/file/lib
+.CURDIR:=${NETBSDSRCDIR}/external/bsd/file/lib
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
CVS commit: src/compat/external/lib
Module Name:src
Committed By: christos
Date: Tue Apr 14 21:20:49 UTC 2009
Modified Files:
src/compat/external/lib: Makefile
Log Message:
Add openldap from Kurt Schreiner. Really, this should just contain:
.include "../../../external/lib/Makefile"
but unfortunately we can't do this yet because we are missing:
SUBDIR+= ../../crypto/external/lib
SUBDIR+= ../bsd/fetch/lib
SUBDIR+= ../bsd/libarchive/lib
SUBDIR+= ../bsd/am-utils/lib
Yelp!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.2 src/compat/external/lib/Makefile:1.3
--- src/compat/external/lib/Makefile:1.2 Sun Apr 12 18:42:36 2009
+++ src/compat/external/lib/Makefile Tue Apr 14 17:20:49 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/04/12 22:42:36 christos Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/14 21:20:49 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -12,6 +12,12 @@
SUBDIR+= ../bsd/atf/lib
.endif
+.if (${MKCRYPTO} != "no")
+.if (${MKLDAP} != "no")
+SUBDIR+= ../bsd/openldap/lib
+.endif
+.endif
+
SUBDIR+= ../bsd/bind/lib
.include
CVS commit: src/compat
Module Name:src
Committed By: christos
Date: Tue Apr 14 17:51:57 UTC 2009
Modified Files:
src/compat: Makefile
Log Message:
Descend into external/lib like the regular external Makefile does, should
make objects properly.
XXX: Now we will descend into lib twice (same as the regular external Makefile
from the top level.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile
diff -u src/compat/Makefile:1.2 src/compat/Makefile:1.3
--- src/compat/Makefile:1.2 Sat Feb 14 08:24:32 2009
+++ src/compat/Makefile Tue Apr 14 13:51:57 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/14 13:24:32 abs Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/14 17:51:57 christos Exp $
# Build 32-bit compat versions of:
# src/gnu/lib/libgcc4 into ${DESTDIR}/usr/lib/<32arch>
@@ -19,6 +19,7 @@
lib/libc .WAIT \
lib/libutil .WAIT \
lib gnu/lib .WAIT \
+ external/lib .WAIT \
libexec/ld.elf_so
.endif
CVS commit: src/compat/external/bsd/bind/lib
Module Name:src
Committed By: christos
Date: Tue Apr 14 17:33:27 UTC 2009
Modified Files:
src/compat/external/bsd/bind/lib/libbind9: Makefile
src/compat/external/bsd/bind/lib/libdns: Makefile
src/compat/external/bsd/bind/lib/libisc: Makefile
src/compat/external/bsd/bind/lib/libisccc: Makefile
src/compat/external/bsd/bind/lib/libisccfg: Makefile
src/compat/external/bsd/bind/lib/liblwres: Makefile
Log Message:
revert previous. we want to link against the compat libs not the regular
ones.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/external/bsd/bind/lib/libbind9/Makefile
cvs rdiff -u -r1.2 -r1.3 src/compat/external/bsd/bind/lib/libdns/Makefile
cvs rdiff -u -r1.2 -r1.3 src/compat/external/bsd/bind/lib/libisc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/compat/external/bsd/bind/lib/libisccc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/compat/external/bsd/bind/lib/libisccfg/Makefile
cvs rdiff -u -r1.2 -r1.3 src/compat/external/bsd/bind/lib/liblwres/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/bsd/bind/lib/libbind9/Makefile
diff -u src/compat/external/bsd/bind/lib/libbind9/Makefile:1.2 src/compat/external/bsd/bind/lib/libbind9/Makefile:1.3
--- src/compat/external/bsd/bind/lib/libbind9/Makefile:1.2 Tue Apr 14 06:39:37 2009
+++ src/compat/external/bsd/bind/lib/libbind9/Makefile Tue Apr 14 13:33:27 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:37 martin Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/14 17:33:27 christos Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= pthread ${NETBSDSRCDIR}/lib/libpthread \
- crypto ${NETBSDSRCDIR}/lib/libcrypto
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
NOCHECKVER= # defined
Index: src/compat/external/bsd/bind/lib/libdns/Makefile
diff -u src/compat/external/bsd/bind/lib/libdns/Makefile:1.2 src/compat/external/bsd/bind/lib/libdns/Makefile:1.3
--- src/compat/external/bsd/bind/lib/libdns/Makefile:1.2 Tue Apr 14 06:39:37 2009
+++ src/compat/external/bsd/bind/lib/libdns/Makefile Tue Apr 14 13:33:27 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:37 martin Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/14 17:33:27 christos Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= pthread ${NETBSDSRCDIR}/lib/libpthread \
- crypto ${NETBSDSRCDIR}/lib/libcrypto
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
NOCHECKVER= # defined
Index: src/compat/external/bsd/bind/lib/libisc/Makefile
diff -u src/compat/external/bsd/bind/lib/libisc/Makefile:1.2 src/compat/external/bsd/bind/lib/libisc/Makefile:1.3
--- src/compat/external/bsd/bind/lib/libisc/Makefile:1.2 Tue Apr 14 06:39:37 2009
+++ src/compat/external/bsd/bind/lib/libisc/Makefile Tue Apr 14 13:33:27 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:37 martin Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/14 17:33:27 christos Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= pthread ${NETBSDSRCDIR}/lib/libpthread \
- crypto ${NETBSDSRCDIR}/lib/libcrypto
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
NOCHECKVER= # defined
Index: src/compat/external/bsd/bind/lib/libisccc/Makefile
diff -u src/compat/external/bsd/bind/lib/libisccc/Makefile:1.2 src/compat/external/bsd/bind/lib/libisccc/Makefile:1.3
--- src/compat/external/bsd/bind/lib/libisccc/Makefile:1.2 Tue Apr 14 06:39:37 2009
+++ src/compat/external/bsd/bind/lib/libisccc/Makefile Tue Apr 14 13:33:27 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:37 martin Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/14 17:33:27 christos Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= pthread ${NETBSDSRCDIR}/lib/libpthread \
- crypto ${NETBSDSRCDIR}/lib/libcrypto
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
NOCHECKVER= # defined
Index: src/compat/external/bsd/bind/lib/libisccfg/Makefile
diff -u src/compat/external/bsd/bind/lib/libisccfg/Makefile:1.2 src/compat/external/bsd/bind/lib/libisccfg/Makefile:1.3
--- src/compat/external/bsd/bind/lib/libisccfg/Makefile:1.2 Tue Apr 14 06:39:38 2009
+++ src/compat/external/bsd/bind/lib/libisccfg/Makefile Tue Apr 14 13:33:27 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:38 martin Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/14 17:33:27 christos Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= p
CVS commit: src/compat/external/bsd/bind/lib
Module Name:src
Committed By: martin
Date: Tue Apr 14 10:39:38 UTC 2009
Modified Files:
src/compat/external/bsd/bind/lib/libbind9: Makefile
src/compat/external/bsd/bind/lib/libdns: Makefile
src/compat/external/bsd/bind/lib/libisc: Makefile
src/compat/external/bsd/bind/lib/libisccc: Makefile
src/compat/external/bsd/bind/lib/libisccfg: Makefile
src/compat/external/bsd/bind/lib/liblwres: Makefile
Log Message:
Replace (wrong) long ../../../ path to library source dir with
a ${NETBSDSRCDIR} based one.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/external/bsd/bind/lib/libbind9/Makefile
cvs rdiff -u -r1.1 -r1.2 src/compat/external/bsd/bind/lib/libdns/Makefile
cvs rdiff -u -r1.1 -r1.2 src/compat/external/bsd/bind/lib/libisc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/compat/external/bsd/bind/lib/libisccc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/compat/external/bsd/bind/lib/libisccfg/Makefile
cvs rdiff -u -r1.1 -r1.2 src/compat/external/bsd/bind/lib/liblwres/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/bsd/bind/lib/libbind9/Makefile
diff -u src/compat/external/bsd/bind/lib/libbind9/Makefile:1.1 src/compat/external/bsd/bind/lib/libbind9/Makefile:1.2
--- src/compat/external/bsd/bind/lib/libbind9/Makefile:1.1 Sun Apr 12 23:04:47 2009
+++ src/compat/external/bsd/bind/lib/libbind9/Makefile Tue Apr 14 10:39:37 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:37 martin Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
- crypto ${.CURDIR}/../../../../../lib/libcrypto
+LIBDPLIBS= pthread ${NETBSDSRCDIR}/lib/libpthread \
+ crypto ${NETBSDSRCDIR}/lib/libcrypto
NOCHECKVER= # defined
Index: src/compat/external/bsd/bind/lib/libdns/Makefile
diff -u src/compat/external/bsd/bind/lib/libdns/Makefile:1.1 src/compat/external/bsd/bind/lib/libdns/Makefile:1.2
--- src/compat/external/bsd/bind/lib/libdns/Makefile:1.1 Sun Apr 12 23:04:47 2009
+++ src/compat/external/bsd/bind/lib/libdns/Makefile Tue Apr 14 10:39:37 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:37 martin Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
- crypto ${.CURDIR}/../../../../../lib/libcrypto
+LIBDPLIBS= pthread ${NETBSDSRCDIR}/lib/libpthread \
+ crypto ${NETBSDSRCDIR}/lib/libcrypto
NOCHECKVER= # defined
Index: src/compat/external/bsd/bind/lib/libisc/Makefile
diff -u src/compat/external/bsd/bind/lib/libisc/Makefile:1.1 src/compat/external/bsd/bind/lib/libisc/Makefile:1.2
--- src/compat/external/bsd/bind/lib/libisc/Makefile:1.1 Sun Apr 12 23:04:47 2009
+++ src/compat/external/bsd/bind/lib/libisc/Makefile Tue Apr 14 10:39:37 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:37 martin Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
- crypto ${.CURDIR}/../../../../../lib/libcrypto
+LIBDPLIBS= pthread ${NETBSDSRCDIR}/lib/libpthread \
+ crypto ${NETBSDSRCDIR}/lib/libcrypto
NOCHECKVER= # defined
Index: src/compat/external/bsd/bind/lib/libisccc/Makefile
diff -u src/compat/external/bsd/bind/lib/libisccc/Makefile:1.1 src/compat/external/bsd/bind/lib/libisccc/Makefile:1.2
--- src/compat/external/bsd/bind/lib/libisccc/Makefile:1.1 Sun Apr 12 23:04:47 2009
+++ src/compat/external/bsd/bind/lib/libisccc/Makefile Tue Apr 14 10:39:37 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:37 martin Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
- crypto ${.CURDIR}/../../../../../lib/libcrypto
+LIBDPLIBS= pthread ${NETBSDSRCDIR}/lib/libpthread \
+ crypto ${NETBSDSRCDIR}/lib/libcrypto
NOCHECKVER= # defined
Index: src/compat/external/bsd/bind/lib/libisccfg/Makefile
diff -u src/compat/external/bsd/bind/lib/libisccfg/Makefile:1.1 src/compat/external/bsd/bind/lib/libisccfg/Makefile:1.2
--- src/compat/external/bsd/bind/lib/libisccfg/Makefile:1.1 Sun Apr 12 23:04:48 2009
+++ src/compat/external/bsd/bind/lib/libisccfg/Makefile Tue Apr 14 10:39:38 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:48 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/14 10:39:38 martin Exp $
NOLINT= # defined
NOMAN= # defined
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
-L
CVS commit: src/compat/external/bsd/bind/lib
Module Name:src
Committed By: christos
Date: Sun Apr 12 23:04:48 UTC 2009
Added Files:
src/compat/external/bsd/bind/lib: Makefile
src/compat/external/bsd/bind/lib/libbind9: Makefile
src/compat/external/bsd/bind/lib/libdns: Makefile
src/compat/external/bsd/bind/lib/libisc: Makefile
src/compat/external/bsd/bind/lib/libisccc: Makefile
src/compat/external/bsd/bind/lib/libisccfg: Makefile
src/compat/external/bsd/bind/lib/liblwres: Makefile
Log Message:
add 32 bit build blue.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libbind9/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libdns/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libisc/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libisccc/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libisccfg/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/liblwres/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/compat/external/bsd/bind/lib/Makefile
diff -u /dev/null src/compat/external/bsd/bind/lib/Makefile:1.1
--- /dev/null Sun Apr 12 19:04:48 2009
+++ src/compat/external/bsd/bind/lib/Makefile Sun Apr 12 19:04:47 2009
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+
+# XXX These bind9/ISC libraries should depend on each other but the
+# XXX dependency ordering requires considerable investigation.
+# XXX Please preserve the order below so we know the order ISC links
+# XXX them in in their Makefiles.
+SUBDIR+= libbind9 libdns liblwres libisccfg libisccc libisc
+
+.include
Index: src/compat/external/bsd/bind/lib/libbind9/Makefile
diff -u /dev/null src/compat/external/bsd/bind/lib/libbind9/Makefile:1.1
--- /dev/null Sun Apr 12 19:04:48 2009
+++ src/compat/external/bsd/bind/lib/libbind9/Makefile Sun Apr 12 19:04:47 2009
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
+
+NOCHECKVER= # defined
+
+.include
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/external/bsd/bind/lib/libbind9
+.CURDIR:=${NETBSDSRCDIR}/external/bsd/bind/lib/libbind9
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
Index: src/compat/external/bsd/bind/lib/libdns/Makefile
diff -u /dev/null src/compat/external/bsd/bind/lib/libdns/Makefile:1.1
--- /dev/null Sun Apr 12 19:04:48 2009
+++ src/compat/external/bsd/bind/lib/libdns/Makefile Sun Apr 12 19:04:47 2009
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
+
+NOCHECKVER= # defined
+
+.include
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/external/bsd/bind/lib/libdns
+.CURDIR:=${NETBSDSRCDIR}/external/bsd/bind/lib/libdns
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
Index: src/compat/external/bsd/bind/lib/libisc/Makefile
diff -u /dev/null src/compat/external/bsd/bind/lib/libisc/Makefile:1.1
--- /dev/null Sun Apr 12 19:04:48 2009
+++ src/compat/external/bsd/bind/lib/libisc/Makefile Sun Apr 12 19:04:47 2009
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
+
+NOCHECKVER= # defined
+
+.include
+
+# Resolve
CVS commit: src/compat/external/lib
Module Name:src Committed By: christos Date: Sun Apr 12 22:42:36 UTC 2009 Modified Files: src/compat/external/lib: Makefile Log Message: build bind libs too To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/compat/external/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/compat/external/lib/Makefile diff -u src/compat/external/lib/Makefile:1.1 src/compat/external/lib/Makefile:1.2 --- src/compat/external/lib/Makefile:1.1 Mon Jan 19 02:19:09 2009 +++ src/compat/external/lib/Makefile Sun Apr 12 18:42:36 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/01/19 07:19:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2009/04/12 22:42:36 christos Exp $ # # This Makefile exists to provide a single point to build @@ -12,4 +12,6 @@ SUBDIR+= ../bsd/atf/lib .endif +SUBDIR+= ../bsd/bind/lib + .include
