d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert NO_PROFILE and NO_LIB32 to new style.

Browse Source
This commit is contained in:
Ruslan Ermilov 2006-03-18 21:37:05 +00:00
parent d7dfbb6b44
commit 5740a2b62d
12 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.inc1
View File

@ -4,7 +4,6 @@
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# -DNO_CLEAN do not clean at all
# -DNO_PROFILE do not build profiled libraries
# -DNO_SHARE do not go into share subdir
# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
@ -179,7 +178,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-DWITHOUT_NLS -DNO_PIC -DNO_PROFILE -DNO_SHARED \
-DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WARNS
# build-tools stage
@ -371,7 +370,7 @@ _libraries:
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; \
${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE libraries
-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
@ -461,7 +460,7 @@ WMAKE_TGTS+= _cleanobj _obj _build-tools
WMAKE_TGTS+= _cross-tools
.endif
WMAKE_TGTS+= _includes _libraries _depend everything
.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
WMAKE_TGTS+= build32
.endif
@ -562,7 +561,7 @@ reinstall:
@echo ">>> Installing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif
@ -571,7 +570,7 @@ redistribute:
@echo ">>> Distributing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32
.endif

4
gnu/lib/libg2c/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$
.include <bsd.own.mk>
SRCDIR= ${.CURDIR}/../../../contrib/libf2c
.PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77
@ -105,7 +107,7 @@ ${E77OBJS:.o=.So}: f2cext.c
${.ALLSRC:M*.c}
.endif
.if !defined(NO_PROFILE)
.if ${MK_PROFILE} != "no"
${E77OBJS:.o=.po}: f2cext.c
${CC} -p ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
.endif

5
gnu/lib/libgcc/Makefile
View File

@ -1,5 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
GCCDIR= ${.CURDIR}/../../../contrib/gcc
@ -197,7 +198,7 @@ ${OBJS_S}: libgcc2.c
${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
.endif
.if !defined(NO_PROFILE)
.if ${MK_PROFILE} != "no"
${OBJS_P}: libgcc2.c
${XCC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
.endif
@ -214,7 +215,7 @@ ${ASM_S}: ${_lib1asmsrc}
-o ${.TARGET} ${.ALLSRC:N*.h}
.endif
.if !defined(NO_PROFILE)
.if ${MK_PROFILE} != "no"
${ASM_P}: ${_lib1asmsrc}
${XCC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \
-o ${.TARGET} ${.ALLSRC:N*.h}

5
gnu/lib/libgcov/Makefile
View File

@ -1,12 +1,13 @@
# $FreeBSD$
NO_PROFILE=
.include <bsd.own.mk>
.include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
GCCDIR= ${.CURDIR}/../../../contrib/gcc
.PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
LIB= gcov
NO_PROFILE=
CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED
CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK
@ -37,7 +38,7 @@ ${OBJS_S}: libgcov.c
${CC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
.endif
.if !defined(NO_PROFILE)
.if ${MK_PROFILE} != "no"
${OBJS_P}: libgcc2.c
${CC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
.endif

2
lib/libc_r/Makefile
View File

@ -30,7 +30,7 @@ SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
.if !defined(NO_PIC)
SYMLINKS+=lib${LIB}.so ${SHLIBDIR}/libpthread.so
.endif
.if !defined(NO_PROFILE)
.if ${MK_PROFILE} != "no"
SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
.endif
.endif

2
lib/libncurses/Makefile
View File

@ -245,7 +245,7 @@ SYMLINKS+=libncurses.so ${LIBDIR}/libtermlib.so
SYMLINKS+=libncurses.so ${LIBDIR}/libmytinfo.so
SYMLINKS+=libncurses.so ${LIBDIR}/libtinfo.so
.endif
.if !defined(NO_PROFILE)
.if ${MK_PROFILE} != "no"
SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a
SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermcap_p.a
SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermlib_p.a

2
lib/libpam/modules/Makefile.inc
View File

@ -3,7 +3,7 @@
PAMDIR= ${.CURDIR}/../../../../contrib/openpam
NO_INSTALLLIB=
NO_PROFILE=
MK_PROFILE= no
CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
WARNS?= 4

5
lib/libthr/Makefile
View File

@ -7,6 +7,9 @@
# To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS
# (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the
# system call stubs.
.include <bsd.own.mk>
LIB=thr
SHLIB_MAJOR= 2
CFLAGS+=-DPTHREAD_KERNEL
@ -40,7 +43,7 @@ SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
.if !defined(NO_PIC)
SYMLINKS+=lib${LIB}.so ${SHLIBDIR}/libpthread.so
.endif
.if !defined(NO_PROFILE)
.if ${MK_PROFILE} != "no"
SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
.endif
.endif

2
lib/ncurses/ncurses/Makefile
View File

@ -245,7 +245,7 @@ SYMLINKS+=libncurses.so ${LIBDIR}/libtermlib.so
SYMLINKS+=libncurses.so ${LIBDIR}/libmytinfo.so
SYMLINKS+=libncurses.so ${LIBDIR}/libtinfo.so
.endif
.if !defined(NO_PROFILE)
.if ${MK_PROFILE} != "no"
SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a
SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermcap_p.a
SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermlib_p.a

4
release/Makefile
View File

@ -375,8 +375,8 @@ release rerelease:
.endif
mkdir -p ${CHROOTDIR}
@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
cd ${WORLDDIR} && ${NATIVEMAKE} -DWITHOUT_GAMES -DWITHOUT_HTML -DNO_LIB32 \
-DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE installworld DESTDIR=${CHROOTDIR}
cd ${WORLDDIR} && ${NATIVEMAKE} -DWITHOUT_GAMES -DWITHOUT_HTML -DWITHOUT_LIB32 \
-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE installworld DESTDIR=${CHROOTDIR}
cd ${WORLDDIR} && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
if [ -f /etc/resolv.conf ]; then \
cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \

6
share/mk/bsd.lib.mk
View File

@ -155,7 +155,7 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS}
.if !defined(INTERNALLIB)
.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
_LIBS+= lib${LIB}_p.a
POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
@ -251,7 +251,7 @@ _libinstall:
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
.endif
.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
.endif
@ -330,7 +330,7 @@ clean:
rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS}
.endif
.if !defined(INTERNALLIB)
.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
rm -f ${POBJS} ${POBJS:S/$/.tmp/}
.endif
.if defined(SHLIB_NAME) || \

4
usr.bin/lex/lib/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$
.include <bsd.own.mk>
LIB= ln
SRCS= libmain.c libyywrap.c
NO_PIC=
@ -7,7 +9,7 @@ NO_PIC=
LINKS= ${LIBDIR}/libln.a ${LIBDIR}/libl.a
LINKS+= ${LIBDIR}/libln.a ${LIBDIR}/libfl.a
.if !defined(NO_PROFILE)
.if ${MK_PROFILE} != "no"
LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a
LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libfl_p.a
.endif