Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src move the build of ldd binary to a subdir in order to allow



details:   https://anonhg.NetBSD.org/src/rev/acd3b0071d80
branches:  trunk
changeset: 764288:acd3b0071d80
user:      plunky <plunky%NetBSD.org@localhost>
date:      Fri Apr 15 08:47:02 2011 +0000

description:
move the build of ldd binary to a subdir in order to allow
explict ordering. This makes "make all" work the same as
"make dependall"

diffstat:

 rescue/list.ldd            |   3 ++-
 usr.bin/ldd/Makefile       |  43 ++-----------------------------------------
 usr.bin/ldd/build/Makefile |  40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 42 deletions(-)

diffs (106 lines):

diff -r 938f86e42401 -r acd3b0071d80 rescue/list.ldd
--- a/rescue/list.ldd   Fri Apr 15 08:43:12 2011 +0000
+++ b/rescue/list.ldd   Fri Apr 15 08:47:02 2011 +0000
@@ -1,6 +1,7 @@
-#      $NetBSD: list.ldd,v 1.6 2011/03/25 18:07:07 joerg Exp $
+#      $NetBSD: list.ldd,v 1.7 2011/04/15 08:47:02 plunky Exp $
 
 PROG   ldd
+SPECIAL        ldd     srcdir  usr.bin/ldd/build
 
 LIBS   ${LDD_ELF32DIR}/libldd_elf32.a
 LIBS   ${LDD_ELF64DIR}/libldd_elf64.a
diff -r 938f86e42401 -r acd3b0071d80 usr.bin/ldd/Makefile
--- a/usr.bin/ldd/Makefile      Fri Apr 15 08:43:12 2011 +0000
+++ b/usr.bin/ldd/Makefile      Fri Apr 15 08:47:02 2011 +0000
@@ -1,44 +1,5 @@
-#      $NetBSD: Makefile,v 1.15 2009/12/15 04:06:43 mrg Exp $
-
-WARNS?=        3       # XXX: -Wsign-compare issues ld.elf_so source
-
-.include <bsd.own.mk>          # for MKDYNAMICROOT definition
-
-PROG=  ldd
-SRCS=  ldd.c
-MAN=   ldd.1
-
-
-SUBDIR+=       elf32 elf64 elf32_compat
-
-.if (${MACHINE_ARCH} != "alpha")
-LIB_ELF32DIR!= cd ${.CURDIR}/elf32 && ${PRINTOBJDIR}
-EXTRA_LIBS+=   ${LIB_ELF32DIR}/libldd_elf32.a
-.endif
+#      $NetBSD: Makefile,v 1.16 2011/04/15 08:47:02 plunky Exp $
 
-.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-LIB_ELF32COMPATDIR!=   cd ${.CURDIR}/elf32_compat && ${PRINTOBJDIR}
-EXTRA_LIBS+=           ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
-.endif
+SUBDIR+=       elf32 elf64 elf32_compat .WAIT build
 
-.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
-    (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
-    (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-LIB_ELF64DIR!= cd ${.CURDIR}/elf64 && ${PRINTOBJDIR}
-EXTRA_LIBS+=   ${LIB_ELF64DIR}/libldd_elf64.a
-CPPFLAGS.ldd.c= -DELFSIZE=64
-.else
-CPPFLAGS.ldd.c= -DELFSIZE=32
-.endif
-
-LDADD+=        ${EXTRA_LIBS}
-DPADD+=        ${EXTRA_LIBS}
-
-.include "Makefile.common"
-
-.if (${MKDYNAMICROOT} == "no")
-LDSTATIC?= -static
-.endif
-
-.include <bsd.prog.mk>
 .include <bsd.subdir.mk>
diff -r 938f86e42401 -r acd3b0071d80 usr.bin/ldd/build/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/ldd/build/Makefile        Fri Apr 15 08:47:02 2011 +0000
@@ -0,0 +1,40 @@
+#      $NetBSD: Makefile,v 1.1 2011/04/15 08:47:02 plunky Exp $
+
+.include <bsd.own.mk>          # for MKDYNAMICROOT definition
+
+PROG=  ldd
+SRCS=  ldd.c
+MAN=   ldd.1
+
+.PATH: ${.CURDIR}/..
+
+.if (${MACHINE_ARCH} != "alpha")
+LIB_ELF32DIR!= cd ${.CURDIR}/../elf32 && ${PRINTOBJDIR}
+EXTRA_LIBS+=   ${LIB_ELF32DIR}/libldd_elf32.a
+.endif
+
+.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+LIB_ELF32COMPATDIR!=   cd ${.CURDIR}/../elf32_compat && ${PRINTOBJDIR}
+EXTRA_LIBS+=           ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
+.endif
+
+.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
+    (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
+    (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+LIB_ELF64DIR!= cd ${.CURDIR}/../elf64 && ${PRINTOBJDIR}
+EXTRA_LIBS+=   ${LIB_ELF64DIR}/libldd_elf64.a
+CPPFLAGS.ldd.c= -DELFSIZE=64
+.else
+CPPFLAGS.ldd.c= -DELFSIZE=32
+.endif
+
+LDADD+=        ${EXTRA_LIBS}
+DPADD+=        ${EXTRA_LIBS}
+
+.include "Makefile.common"
+
+.if (${MKDYNAMICROOT} == "no")
+LDSTATIC?= -static
+.endif
+
+.include <bsd.prog.mk>



Home | Main Index | Thread Index | Old Index