Source-Changes-HG archive

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

[src/trunk]: src rename LD32DIR to MLIBDIR.



details:   https://anonhg.NetBSD.org/src/rev/06c27d24459a
branches:  trunk
changeset: 749931:06c27d24459a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Dec 13 08:25:20 2009 +0000

description:
rename LD32DIR to MLIBDIR.

diffstat:

 compat/Makefile.compat                      |  38 ++++++++++++++--------------
 compat/lib/csu/Makefile                     |   8 +++---
 compat/lib/csu/Makefile.real                |   8 +++---
 lib/i18n_module/Makefile.inc                |  10 +++---
 lib/libarch/Makefile                        |   6 ++--
 lib/libarch/i386/Makefile.inc               |   6 ++--
 lib/libarch/x86_64/Makefile.inc             |   6 ++--
 lib/libpam/Makefile.inc                     |  10 ++++++-
 lib/libpam/modules/mod.mk                   |   6 ++--
 libexec/ld.elf_so/Makefile                  |   4 +-
 libexec/ld.elf_so/arch/i386/Makefile.inc    |   4 +-
 libexec/ld.elf_so/arch/sparc/Makefile.inc   |   4 +-
 sys/rump/librump/rumpkern/Makefile.rumpkern |   8 +++---
 13 files changed, 62 insertions(+), 56 deletions(-)

diffs (288 lines):

diff -r 7f9231b2ae50 -r 06c27d24459a compat/Makefile.compat
--- a/compat/Makefile.compat    Sun Dec 13 08:03:44 2009 +0000
+++ b/compat/Makefile.compat    Sun Dec 13 08:25:20 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.compat,v 1.5 2009/05/19 20:27:50 christos Exp $
+#      $NetBSD: Makefile.compat,v 1.6 2009/12/13 08:25:20 mrg Exp $
 
 COPTS+=                        -m32
 CPUFLAGS+=             -m32
@@ -8,30 +8,30 @@
 # XXX ugly
 .if ${MACHINE_ARCH} == "sparc64"
 LD+=                   -m elf32_sparc
-LD32DIR=               sparc
+MLIBDIR=               sparc
 .elif ${MACHINE_ARCH} == "x86_64"
 LD+=                   -m elf_i386
-LD32DIR=               i386
+MLIBDIR=               i386
 .endif
 
-LIBDIR=                        /usr/lib/${LD32DIR}
-SHLIBDIR=              /usr/lib/${LD32DIR}
-SHLIBINSTALLDIR=       /usr/lib/${LD32DIR}
+LIBDIR=                        /usr/lib/${MLIBDIR}
+SHLIBDIR=              /usr/lib/${MLIBDIR}
+SHLIBINSTALLDIR=       /usr/lib/${MLIBDIR}
 
-COMMON_MACHINE_ARCH=   ${LD32DIR}
-LIBC_MACHINE_ARCH=     ${LD32DIR}
-BFD_MACHINE_ARCH=      ${LD32DIR}
-CRYPTO_MACHINE_CPU=    ${LD32DIR}
-KVM_MACHINE_ARCH=      ${LD32DIR}
-PTHREAD_MACHINE_ARCH=  ${LD32DIR}
-LDELFSO_MACHINE_CPU=   ${LD32DIR}
+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/${LD32DIR}/crtbegin.o
-_GCC_CRTBEGINS?=       ${DESTDIR}/usr/lib/${LD32DIR}/crtbeginS.o
-_GCC_CRTEND?=          ${DESTDIR}/usr/lib/${LD32DIR}/crtend.o
-_GCC_CRTENDS?=         ${DESTDIR}/usr/lib/${LD32DIR}/crtendS.o
-_GCC_CRTDIR?=          ${DESTDIR}/usr/lib/${LD32DIR}
-_GCC_LIBGCCDIR?=       ${DESTDIR}/usr/lib/${LD32DIR}
+_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
diff -r 7f9231b2ae50 -r 06c27d24459a compat/lib/csu/Makefile
--- a/compat/lib/csu/Makefile   Sun Dec 13 08:03:44 2009 +0000
+++ b/compat/lib/csu/Makefile   Sun Dec 13 08:25:20 2009 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.3 2008/10/27 07:42:55 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2009/12/13 08:25:20 mrg Exp $
 
 # XXX
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/compat/Makefile.compat"
-depend dependall all: ${DESTDIR}/usr/lib/${LD32DIR}
-depend dependall all: ${DESTDIR}/usr/lib/${LD32DIR}/i18n
-depend dependall all: ${DESTDIR}/usr/lib/${LD32DIR}/security
+depend dependall all: ${DESTDIR}/usr/lib/${MLIBDIR}
+depend dependall all: ${DESTDIR}/usr/lib/${MLIBDIR}/i18n
+depend dependall all: ${DESTDIR}/usr/lib/${MLIBDIR}/security
 
 .if ${MACHINE_ARCH} == "x86_64"
 SUBDIR=        i386_elf
diff -r 7f9231b2ae50 -r 06c27d24459a compat/lib/csu/Makefile.real
--- a/compat/lib/csu/Makefile.real      Sun Dec 13 08:03:44 2009 +0000
+++ b/compat/lib/csu/Makefile.real      Sun Dec 13 08:25:20 2009 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile.real,v 1.2 2008/10/27 07:42:55 mrg Exp $
+#      $NetBSD: Makefile.real,v 1.3 2009/12/13 08:25:20 mrg Exp $
 
 # XXX
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/compat/Makefile.compat"
-depend dependall all: ${DESTDIR}/usr/lib/${LD32DIR}
-depend dependall all: ${DESTDIR}/usr/lib/${LD32DIR}/i18n
-depend dependall all: ${DESTDIR}/usr/lib/${LD32DIR}/security
+depend dependall all: ${DESTDIR}/usr/lib/${MLIBDIR}
+depend dependall all: ${DESTDIR}/usr/lib/${MLIBDIR}/i18n
+depend dependall all: ${DESTDIR}/usr/lib/${MLIBDIR}/security
 
 .if ${MACHINE_ARCH} == "x86_64"
 SUBDIR=        i386_elf
diff -r 7f9231b2ae50 -r 06c27d24459a lib/i18n_module/Makefile.inc
--- a/lib/i18n_module/Makefile.inc      Sun Dec 13 08:03:44 2009 +0000
+++ b/lib/i18n_module/Makefile.inc      Sun Dec 13 08:25:20 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.10 2008/10/26 07:06:07 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.11 2009/12/13 08:25:20 mrg Exp $
 
 NOLINT=                # defined
 NOPICINSTALL=  # defined
@@ -7,10 +7,10 @@
 .include <bsd.own.mk>
 
 SHLIB_VERSION_FILE=    ${NETBSDSRCDIR}/lib/i18n_module/shlib_version
-.if defined(LD32DIR)
-LIBDIR=                /usr/lib/${LD32DIR}/i18n
-SHLIBDIR=      /usr/lib/${LD32DIR}/i18n
-SHLIBINSTALLDIR=/usr/lib/${LD32DIR}/i18n
+.if defined(MLIBDIR)
+LIBDIR=                /usr/lib/${MLIBDIR}/i18n
+SHLIBDIR=      /usr/lib/${MLIBDIR}/i18n
+SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/i18n
 .else
 LIBDIR=                /usr/lib/i18n
 SHLIBDIR=      /usr/lib/i18n
diff -r 7f9231b2ae50 -r 06c27d24459a lib/libarch/Makefile
--- a/lib/libarch/Makefile      Sun Dec 13 08:03:44 2009 +0000
+++ b/lib/libarch/Makefile      Sun Dec 13 08:25:20 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2008/10/26 07:05:33 mrg Exp $
+#      $NetBSD: Makefile,v 1.22 2009/12/13 08:25:20 mrg Exp $
 
 # These should always be a MACHINE_CPU value
 ARCHDIRS= alpha arm i386 m68k sparc x86_64
@@ -14,8 +14,8 @@
 
 # Build the library if SRCS is now defined ...
 .if defined(SRCS)
-.if defined(LD32DIR) && ${LD32DIR} != "none"
-LIB=   ${LD32DIR}
+.if defined(MLIBDIR) && ${MLIBDIR} != "none"
+LIB=   ${MLIBDIR}
 .else
 LIB=   ${MACHINE_CPU}
 .endif
diff -r 7f9231b2ae50 -r 06c27d24459a lib/libarch/i386/Makefile.inc
--- a/lib/libarch/i386/Makefile.inc     Sun Dec 13 08:03:44 2009 +0000
+++ b/lib/libarch/i386/Makefile.inc     Sun Dec 13 08:25:20 2009 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile.inc,v 1.13 2008/10/26 07:05:33 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.14 2009/12/13 08:25:20 mrg Exp $
 
-LD32DIR?=      none
+MLIBDIR?=      none
 
-.if (${MACHINE_ARCH} == "i386" || ${LD32DIR} == "i386")
+.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR} == "i386")
 SRCS+= i386_get_ldt.c i386_set_ldt.c \
        i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
        i386_vm86.c i386_pmc.c i386_mtrr.c
diff -r 7f9231b2ae50 -r 06c27d24459a lib/libarch/x86_64/Makefile.inc
--- a/lib/libarch/x86_64/Makefile.inc   Sun Dec 13 08:03:44 2009 +0000
+++ b/lib/libarch/x86_64/Makefile.inc   Sun Dec 13 08:25:20 2009 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile.inc,v 1.3 2008/10/26 07:05:33 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2009/12/13 08:25:20 mrg Exp $
 
-LD32DIR?=      none
+MLIBDIR?=      none
 
-.if (${MACHINE_ARCH} == "x86_64" && ${LD32DIR} != "i386")
+.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR} != "i386")
 SRCS+= x86_64_mtrr.c x86_64_iopl.c
 .endif
 
diff -r 7f9231b2ae50 -r 06c27d24459a lib/libpam/Makefile.inc
--- a/lib/libpam/Makefile.inc   Sun Dec 13 08:03:44 2009 +0000
+++ b/lib/libpam/Makefile.inc   Sun Dec 13 08:25:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2009/07/20 17:30:54 christos Exp $
+# $NetBSD: Makefile.inc,v 1.11 2009/12/13 08:25:20 mrg Exp $
 # Copyright 1998 Juniper Networks, Inc.
 # All rights reserved.
 #
@@ -27,7 +27,13 @@
 
 USE_FORT?= yes # network client software *and* authentication software
 
-CPPFLAGS+= -DOPENPAM_MODULES_DIR=\"/usr/lib/security\"
+.if defined(MLIBDIR)
+MODLIBDIR=/usr/lib/${MLIBDIR}/security
+.else
+MODLIBDIR=/usr/lib/security
+.endif
+
+CPPFLAGS+= -DOPENPAM_MODULES_DIR=\"${MODLIBDIR}\"
 # No debugging
 #CPPFLAGS+= -DDEBUG
 
diff -r 7f9231b2ae50 -r 06c27d24459a lib/libpam/modules/mod.mk
--- a/lib/libpam/modules/mod.mk Sun Dec 13 08:03:44 2009 +0000
+++ b/lib/libpam/modules/mod.mk Sun Dec 13 08:25:20 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mod.mk,v 1.6 2008/10/27 07:48:27 mrg Exp $
+#      $NetBSD: mod.mk,v 1.7 2009/12/13 08:25:20 mrg Exp $
 
 NOLINT=                # don't build a lint library
 NOPROFILE=     # don't build a profile library
@@ -8,8 +8,8 @@
 
 .include "${.CURDIR}/../../Makefile.inc"
 
-.if defined(LD32DIR)
-LIBDIR=/usr/lib/${LD32DIR}/security
+.if defined(MLIBDIR)
+LIBDIR=/usr/lib/${MLIBDIR}/security
 .else
 LIBDIR=/usr/lib/security
 .endif
diff -r 7f9231b2ae50 -r 06c27d24459a libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Sun Dec 13 08:03:44 2009 +0000
+++ b/libexec/ld.elf_so/Makefile        Sun Dec 13 08:25:20 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.90 2009/05/20 19:38:38 ad Exp $
+#      $NetBSD: Makefile,v 1.91 2009/12/13 08:25:20 mrg Exp $
 #
 # NOTE: when changing ld.so, ensure that ldd still compiles.
 #
@@ -45,7 +45,7 @@
 .endif
 
 # Support src/compat/libexec/ld.elf_so.
-.if defined(LD32DIR)
+.if defined(MLIBDIR)
 CLIBOBJ!=      cd ${NETBSDSRCDIR}/compat/lib/libc && ${PRINTOBJDIR}
 .else
 CLIBOBJ!=      cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR}
diff -r 7f9231b2ae50 -r 06c27d24459a libexec/ld.elf_so/arch/i386/Makefile.inc
--- a/libexec/ld.elf_so/arch/i386/Makefile.inc  Sun Dec 13 08:03:44 2009 +0000
+++ b/libexec/ld.elf_so/arch/i386/Makefile.inc  Sun Dec 13 08:25:20 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.12 2009/01/06 02:15:06 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.13 2009/12/13 08:25:20 mrg Exp $
 
 SRCS+=         rtld_start.S mdreloc.c
 
@@ -9,6 +9,6 @@
 
 LDFLAGS+=      -Wl,-e,.rtld_start
 
-.if defined(LD32DIR)
+.if defined(MLIBDIR)
 .include "Makefile.ld32"
 .endif
diff -r 7f9231b2ae50 -r 06c27d24459a libexec/ld.elf_so/arch/sparc/Makefile.inc
--- a/libexec/ld.elf_so/arch/sparc/Makefile.inc Sun Dec 13 08:03:44 2009 +0000
+++ b/libexec/ld.elf_so/arch/sparc/Makefile.inc Sun Dec 13 08:25:20 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.12 2009/01/06 02:15:06 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.13 2009/12/13 08:25:20 mrg Exp $
 
 SRCS+=         rtld_start.S mdreloc.c
 
@@ -9,6 +9,6 @@
 
 LDFLAGS+=      -Wl,-e,_rtld_start
 
-.if defined(LD32DIR)
+.if defined(MLIBDIR)
 .include "Makefile.ld32"
 .endif
diff -r 7f9231b2ae50 -r 06c27d24459a sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Dec 13 08:03:44 2009 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Dec 13 08:25:20 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.66 2009/12/01 09:52:29 pooka Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.67 2009/12/13 08:25:20 mrg Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -87,9 +87,9 @@
 # the kernel of our compat target (amd64->i386 & sparc64->sparc), so
 # take MD stuff from the right arch.
 #
-.ifdef LD32DIR
-ARCHDIR=       ${RUMPTOP}/librump/rumpkern/arch/${LD32DIR}
-LIBKERN_ARCH=  ${LD32DIR}
+.ifdef MLIBDIR
+ARCHDIR=       ${RUMPTOP}/librump/rumpkern/arch/${MLIBDIR}
+LIBKERN_ARCH=  ${MLIBDIR}
 .else
 ARCHDIR=       ${RUMPTOP}/librump/rumpkern/arch/${MACHINE_ARCH}
 .endif



Home | Main Index | Thread Index | Old Index