[BACK]Return to Makefile CVS log [TXT][DIR] Up to [local] / src

Diff for /src/Makefile between version 1.49 and 1.86

version 1.49, 1999/03/02 21:47:32 version 1.86, 2002/08/11 22:48:05
Line 4 
Line 4 
 # For more information on building in tricky environments, please see  # For more information on building in tricky environments, please see
 # the list of possible environment variables described in  # the list of possible environment variables described in
 # /usr/share/mk/bsd.README.  # /usr/share/mk/bsd.README.
 #  #
 # Building recommendations:  # Building recommendations:
 #  #
 # 1) If at all possible, put this source tree in /usr/src.  If /usr/src  # 1) If at all possible, put this source tree in /usr/src.  If /usr/src
 # must be a symbolic link, setenv BSDSRCDIR to point to the real location.  # must be a symbolic link, setenv BSDSRCDIR to point to the real location.
 #  #
Line 25 
Line 25 
 # "make build" target supplied here. Good luck.  # "make build" target supplied here. Good luck.
 #  #
 # 5) If you want to setup a cross-build environment, there is a "cross-tools"  # 5) If you want to setup a cross-build environment, there is a "cross-tools"
 # target available which upon completion of "make TARGET=<target> cross-tools"  # target available which upon completion of "make TARGET=<target> cross-tools"
 # (where <target> is one of the names in the /sys/arch directory) will produce  # (where <target> is one of the names in the /sys/arch directory) will produce
 # a set of compilation tools along with the includes in the /usr/cross/<target>  # a set of compilation tools along with the includes in the /usr/cross/<target>
 # directory.  # directory.
Line 38 
Line 38 
   
 SUBDIR+= sys lkm  SUBDIR+= sys lkm
   
 .if (${KERBEROS} == "yes")  .if (${KERBEROS:L} == "yes")
 SUBDIR+= kerberosIV  SUBDIR+= kerberosIV
 .endif  .endif
   
 .if   make(clean) || make(cleandir) || make(obj)  .if (${KERBEROS5:L} == "yes")
 SUBDIR+= distrib  SUBDIR+= kerberosV
 .endif  .endif
   
 .if exists(regress)  .if   make(clean) || make(cleandir) || make(obj)
 .ifmake !(install)  SUBDIR+= distrib regress
 SUBDIR+= regress  
 .endif  .endif
   
   .if exists(regress)
 regression-tests:  regression-tests:
         @echo Running regression tests...          @echo Running regression tests...
         @(cd ${.CURDIR}/regress && ${MAKE} regress)          @cd ${.CURDIR}/regress && ${MAKE} depend && exec ${MAKE} regress
 .endif  .endif
   
 includes:  includes:
         (cd ${.CURDIR}/include; ${MAKE} includes)          cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes
   
 beforeinstall:  beforeinstall:
 .ifndef DESTDIR          cd ${.CURDIR}/etc && exec ${MAKE} DESTDIR=${DESTDIR} distrib-dirs
         (cd ${.CURDIR}/etc && ${MAKE} DESTDIR= distrib-dirs)          cd ${.CURDIR}/include && exec ${MAKE} includes
 .else  
         (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)  
 .endif  
         (cd ${.CURDIR}/include; ${MAKE} includes)  
   
 afterinstall:  afterinstall:
 .ifndef NOMAN  .ifndef NOMAN
         (cd ${.CURDIR}/share/man && ${MAKE} makedb)          cd ${.CURDIR}/share/man && exec ${MAKE} makedb
 .endif  .endif
   
 build:  build:
 .ifdef GLOBAL_AUTOCONF_CACHE  .ifdef GLOBAL_AUTOCONF_CACHE
         rm -f ${GLOBAL_AUTOCONF_CACHE}          cp /dev/null ${GLOBAL_AUTOCONF_CACHE}
 .endif  .endif
         (cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)          cd ${.CURDIR}/share/mk && exec ${SUDO} ${MAKE} install
         (cd ${.CURDIR}/include; ${MAKE} prereq; ${SUDO} ${MAKE} includes)          cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes
         ${SUDO} ${MAKE} cleandir          ${SUDO} ${MAKE} cleandir
         (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \          cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \
             ${SUDO} ${MAKE} install)              NOMAN=1 exec ${SUDO} ${MAKE} install
         (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \          cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
             ${SUDO} ${MAKE} install)              NOMAN=1 exec ${SUDO} ${MAKE} install
 .if (${MACHINE_ARCH} == "mips")  .if (${KERBEROS:L} == "yes")
         ldconfig          cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
               NOMAN=1 exec ${SUDO} ${MAKE} install
 .endif  .endif
 .if (${KERBEROS} == "yes")  .if (${KERBEROS5:L} == "yes")
         (cd ${.CURDIR}/kerberosIV && ${MAKE} SUDO=${SUDO} build)          cd ${.CURDIR}/kerberosV/lib && ${MAKE} depend && ${MAKE} && \
 .if (${MACHINE_ARCH} == "mips")              NOMAN=1 exec ${SUDO} ${MAKE} install
         ldconfig  
 .endif  .endif
 .endif          cd ${.CURDIR}/gnu/usr.bin/perl && \
         ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install              ${MAKE} -f Makefile.bsd-wrapper depend && \
               ${MAKE} -f Makefile.bsd-wrapper perl.lib && \
               exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib
           ${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
   
 .if !defined(TARGET)  .if !defined(TARGET)
 cross-tools:  cross-tools:
Line 104 
Line 103 
 CROSSDIR=       ${DESTDIR}/usr/cross/${TARGET}  CROSSDIR=       ${DESTDIR}/usr/cross/${TARGET}
 CROSSENV=       AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \  CROSSENV=       AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \
                 CC=${CROSSDIR}/usr/bin/cc CPP=${CROSSDIR}/usr/bin/cpp \                  CC=${CROSSDIR}/usr/bin/cc CPP=${CROSSDIR}/usr/bin/cpp \
                   CXX=${CROSSDIR}/usr/bin/c++ \
                 LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \                  LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \
                 LORDER=${CROSSDIR}/usr/bin/lorder \                  LORDER=/usr/bin/lorder RANLIB=${CROSSDIR}/usr/bin/ranlib \
                 RANLIB=${CROSSDIR}/usr/bin/ranlib \  
                 SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \                  SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \
                 HOSTCC=cc                  HOSTCC=cc
   CROSSPATH=      ${PATH}:${CROSSDIR}/usr/bin
   
   cross-env:
           @echo ${CROSSENV} DESTDIR=${CROSSDIR} MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`
   
 cross-helpers:  cross-helpers:
         mkdir -p ${CROSSDIR}          @-mkdir -p ${CROSSDIR}
         echo _MACHINE_ARCH | \          @case ${TARGET} in \
             cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \                  sparc|i386|m68k|alpha|hppa|powerpc|sparc64|m88k|vax) \
             ${CPP} -E -I${.CURDIR}/sys/arch | \                          echo ${TARGET} ;;\
             sed -n '$$p' >${CROSSDIR}/TARGET_ARCH                  amiga|sun3|mac68k|hp300|mvme68k) \
 # GROSS KLUDGE  MACHINE_ARCH is mips, but we use mipsel for gnu tools.                          echo m68k ;;\
 .if ${TARGET} == "arc" || ${TARGET} == "pmax"                  mvme88k) \
         eval `grep '^osr=' sys/conf/newvers.sh`; \                          echo m88k ;;\
            sed "s/\$$/el-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \                  mvmeppc|macppc) \
            ${CROSSDIR}/TARGET_CANON                          echo powerpc ;;\
 .else                  *) \
         eval `grep '^osr=' sys/conf/newvers.sh`; \                          (echo Unknown arch ${TARGET} >&2) ; exit 1;; \
           esac > ${CROSSDIR}/TARGET_ARCH
           @echo TARGET_ARCH is `cat ${CROSSDIR}/TARGET_ARCH`
           @eval `grep '^osr=' sys/conf/newvers.sh`; \
            sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \             sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
            ${CROSSDIR}/TARGET_CANON             ${CROSSDIR}/TARGET_CANON
 .endif  
   
 cross-dirs:     ${CROSSDIR}/stamp.dirs  cross-dirs:     ${CROSSDIR}/stamp.dirs
         @-mkdir -p ${CROSSDIR}          @-mkdir -p ${CROSSDIR}
         @-mkdir -p ${CROSSDIR}/usr/obj          @-mkdir -p ${CROSSDIR}/usr/obj
         @-mkdir -p ${CROSSDIR}/usr/bin          @-mkdir -p ${CROSSDIR}/usr/bin
         @-mkdir -p ${CROSSDIR}/usr/include          @-mkdir -p ${CROSSDIR}/usr/include/kerberosIV
         @-mkdir -p ${CROSSDIR}/usr/lib          @-mkdir -p ${CROSSDIR}/usr/include/kerberosV
           @-mkdir -p ${CROSSDIR}/usr/lib/apache/include/xml
           @-mkdir -p ${CROSSDIR}/usr/libexec
         @-mkdir -p ${CROSSDIR}/var/db          @-mkdir -p ${CROSSDIR}/var/db
         @-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`          @-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`
         @ln -sf ${CROSSDIR}/usr/include \          @ln -sf ${CROSSDIR}/usr/include \
                 ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include              ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include
         @ln -sf ${CROSSDIR}/usr/lib \          @ln -sf ${CROSSDIR}/usr/lib \
             ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib              ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib
         @-mkdir -p ${CROSSDIR}/usr/obj          @-mkdir -p ${CROSSDIR}/usr/obj
Line 147 
Line 154 
         @touch ${CROSSDIR}/stamp.dirs          @touch ${CROSSDIR}/stamp.dirs
   
 cross-includes: cross-dirs  cross-includes: cross-dirs
         export MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` ;\          cd include; \
               MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
               ${MAKE} prereq && \
               MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
             ${MAKE} DESTDIR=${CROSSDIR} includes              ${MAKE} DESTDIR=${CROSSDIR} includes
   
 .if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \  .if ${TARGET} == "macppc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \
     ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa"      ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc" || ${TARGET} == "sparc"
 cross-binutils: cross-binutils-new  cross-binutils: cross-binutils-new cross-binutils-links
 .else  .else
 cross-binutils: cross-binutils-old  cross-binutils: cross-binutils-old cross-binutils-links
 .endif  .endif
   
 cross-binutils-new:     cross-dirs  cross-binutils-new:     cross-dirs
Line 166 
Line 176 
             (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \              (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \
             /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \              /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
             --prefix ${CROSSDIR}/usr \              --prefix ${CROSSDIR}/usr \
               --disable-nls --disable-gdbtk --disable-commonbfdlib \
             --target `cat ${CROSSDIR}/TARGET_CANON` && \              --target `cat ${CROSSDIR}/TARGET_CANON` && \
             ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install)              ${MAKE} CFLAGS="${CFLAGS}" && ${MAKE} install )
         ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \  
             ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \  
             ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-as \  
             ${CROSSDIR}/usr/bin/as  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ar \  
             ${CROSSDIR}/usr/bin/ar  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ld \  
             ${CROSSDIR}/usr/bin/ld  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-strip \  
             ${CROSSDIR}/usr/bin/strip  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-size \  
             ${CROSSDIR}/usr/bin/size  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ranlib \  
             ${CROSSDIR}/usr/bin/ranlib  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-nm \  
             ${CROSSDIR}/usr/bin/nm  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-strings \  
             ${CROSSDIR}/usr/bin/strings  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder \  
             ${CROSSDIR}/usr/bin/lorder  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objcopy \  
             ${CROSSDIR}/usr/bin/objcopy  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objdump \  
             ${CROSSDIR}/usr/bin/objdump  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gdb \  
             ${CROSSDIR}/usr/bin/gdb  
   
 cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \  cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \
         cross-ranlib cross-nm          cross-ranlib cross-nm
   
   cross-binutils-links: cross-dirs
           for cmd in ar as ld nm ranlib objcopy objdump size strings strip; do \
               if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
                   ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd \
                   ${CROSSDIR}/usr/bin/$$cmd ;\
               elif [ -e ${CROSSDIR}/usr/bin/$$cmd -a ! -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
                   ln -sf ${CROSSDIR}/usr/bin/$$cmd \
                   ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd; \
               fi ;\
           done
   
 cross-gas:      cross-dirs  cross-gas:      cross-dirs
         (cd ${.CURDIR}/gnu/usr.bin/gas; \          (cd ${.CURDIR}/gnu/usr.bin/gas; \
             BSDOBJDIR=${CROSSDIR}/usr/obj \              BSDOBJDIR=${CROSSDIR}/usr/obj \
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} obj; \              ${MAKE} obj; \
             TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
             ${MAKE}; \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} depend all; \
             TARGET_MACHINE_ARCH=${TARGET} \              TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
         ln -sf ${CROSSDIR}/usr/bin/as \          ln -sf ${CROSSDIR}/usr/bin/as \
Line 217 
Line 212 
             BSDOBJDIR=${CROSSDIR}/usr/obj \              BSDOBJDIR=${CROSSDIR}/usr/obj \
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} obj; \              ${MAKE} obj; \
             TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
             ${MAKE} NOMAN=; \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
             TARGET_MACHINE_ARCH=${TARGET} \              TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
         ln -sf ${CROSSDIR}/usr/bin/ld \          ln -sf ${CROSSDIR}/usr/bin/ld \
Line 230 
Line 225 
             BSDOBJDIR=${CROSSDIR}/usr/obj \              BSDOBJDIR=${CROSSDIR}/usr/obj \
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} obj; \              ${MAKE} obj; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
         ln -sf ${CROSSDIR}/usr/bin/ar \          ln -sf ${CROSSDIR}/usr/bin/ar \
Line 241 
Line 236 
             BSDOBJDIR=${CROSSDIR}/usr/obj \              BSDOBJDIR=${CROSSDIR}/usr/obj \
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} obj; \              ${MAKE} obj; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
         ln -sf ${CROSSDIR}/usr/bin/ranlib \          ln -sf ${CROSSDIR}/usr/bin/ranlib \
Line 253 
Line 248 
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} obj; \              ${MAKE} obj; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \              ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
               NOMAN= depend all; \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= install)              ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
               NOMAN= install)
         ln -sf ${CROSSDIR}/usr/bin/strip \          ln -sf ${CROSSDIR}/usr/bin/strip \
             ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip              ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
   
Line 265 
Line 262 
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} obj; \              ${MAKE} obj; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \              ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
               NOMAN= depend all; \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
         ln -sf ${CROSSDIR}/usr/bin/size \          ln -sf ${CROSSDIR}/usr/bin/size \
Line 277 
Line 275 
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} obj; \              ${MAKE} obj; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \              ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
               NOMAN= depend all; \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
         ln -sf ${CROSSDIR}/usr/bin/nm \          ln -sf ${CROSSDIR}/usr/bin/nm \
             ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm              ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
   
 cross-gcc:      cross-dirs  cross-gcc:      cross-dirs
         cd ${.CURDIR}/gnu/usr.bin/gcc; \          cd ${.CURDIR}/gnu/egcs/gcc; \
             BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \              BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} -f Makefile.bsd-wrapper obj              ${MAKE} -f Makefile.bsd-wrapper obj
         (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \          (cd ${CROSSDIR}/usr/obj/gnu/egcs/gcc; \
             /bin/sh ${.CURDIR}/gnu/usr.bin/gcc/configure \              /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \
             --prefix ${CROSSDIR}/usr \              --prefix ${CROSSDIR}/usr \
             --target `cat ${CROSSDIR}/TARGET_CANON` && \              --target `cat ${CROSSDIR}/TARGET_CANON` \
             ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \              --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \
             build_infodir=. \              PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="c c++" \
               LDFLAGS=${LDSTATIC} build_infodir=. \
             GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \              GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
             ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \              ${MAKE} BISON=yacc LANGUAGES="c c++" LDFLAGS=${LDSTATIC} \
             GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \              GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \
             build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)              build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \          ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \
             ${CROSSDIR}/usr/bin/cc              ${CROSSDIR}/usr/bin/cc
         CPP=`${CROSSDIR}/usr/bin/cc -print-libgcc-file-name | \          ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-g++ \
             sed 's/libgcc\.a/cpp/'`; \              ${CROSSDIR}/usr/bin/c++
             sed -e 's#/usr/libexec/cpp#'$$CPP'#' \          ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
               ${CROSSDIR}/usr/obj/gnu/egcs/gcc/cpp \
               ${CROSSDIR}/usr/libexec/cpp
           sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \
             -e 's#/usr/include#${CROSSDIR}/usr/include#' \              -e 's#/usr/include#${CROSSDIR}/usr/include#' \
             ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp              ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp
         chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp          chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
         chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp          chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/bin/cpp
   
 # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later  # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
 cross-lib:      cross-dirs  cross-lib:      cross-dirs
Line 331 
Line 334 
             ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \              DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
 .if (${KERBEROS} == "yes")  .if (${KERBEROS:L} == "yes")
         (cd kerberosIV; \          MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
             BSDOBJDIR=${CROSSDIR}/usr/obj \          export MACHINE MACHINE_ARCH; \
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \          cd kerberosIV/lib; \
             ${MAKE} obj; \          BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
             for lib in acl krb kadm kafs kdb; do \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \
                 (cd $$lib; \          ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                     ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              ${MAKE} NOMAN= depend; \
                     ${MAKE} NOMAN= depend; \          ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
                     ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \          ${CROSSENV} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                     ${MAKE} NOMAN=; \              ${MAKE} NOMAN= install
                     DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \  .endif
                     ${MAKE} NOMAN= install); \  .if (${KERBEROS5:L} == "yes")
             done)          MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
           export MACHINE MACHINE_ARCH; \
           cd kerberosV/lib; \
           BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
               MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \
           ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               ${MAKE} NOMAN= depend; \
           ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
           ${CROSSENV} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               ${MAKE} NOMAN= install
 .endif  .endif
 .endif  .endif
   
Legend:
Removed from v.1.49  
changed lines
  Added in v.1.86