Date: Tue, 1 Dec 2015 22:20:04 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291620 - in head: gnu/usr.bin/dtc lib/libarchive/tests lib/libbsm lib/libc++ lib/msun libexec/rtld-elf usr.bin/cpio usr.bin/cpio/tests usr.bin/tar usr.bin/tar/tests Message-ID: <201512012220.tB1MK4EF013298@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Dec 1 22:20:04 2015 New Revision: 291620 URL: https://svnweb.freebsd.org/changeset/base/291620 Log: Don't override LIB*DIR variables from src.libnames.mk. In some cases switch to the LIB*SRCDIR value. These recently were defined in r291327 and r291619. Sponsored by: EMC / Isilon Storage Division Modified: head/gnu/usr.bin/dtc/Makefile head/lib/libarchive/tests/Makefile head/lib/libbsm/Makefile head/lib/libc++/Makefile head/lib/msun/Makefile head/libexec/rtld-elf/Makefile head/usr.bin/cpio/Makefile head/usr.bin/cpio/tests/Makefile head/usr.bin/tar/Makefile head/usr.bin/tar/tests/Makefile Modified: head/gnu/usr.bin/dtc/Makefile ============================================================================== --- head/gnu/usr.bin/dtc/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/gnu/usr.bin/dtc/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -3,8 +3,8 @@ .include <bsd.own.mk> DTCDIR= ${.CURDIR}/../../../contrib/dtc -LIBFDTDIR= ${.CURDIR}/../../../sys/contrib/libfdt -.PATH: ${DTCDIR} ${LIBFDTDIR} +_LIBFDTDIR= ${.CURDIR}/../../../sys/contrib/libfdt +.PATH: ${DTCDIR} ${_LIBFDTDIR} PROG= dtc @@ -14,7 +14,7 @@ SRCS= dtc.c checks.c fstree.c livetree.c fdt_sw.c fdt_wip.c ${DTCVERSIONFILE} WARNS?= 2 -CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${LIBFDTDIR} +CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${_LIBFDTDIR} VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' ${DTCDIR}/Makefile VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile Modified: head/lib/libarchive/tests/Makefile ============================================================================== --- head/lib/libarchive/tests/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/lib/libarchive/tests/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -1,6 +1,6 @@ # $FreeBSD$ -LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test @@ -9,14 +9,14 @@ BINDIR= ${TESTSDIR} PROGS+= libarchive_test CFLAGS+= -I${.CURDIR:H} -I${.OBJDIR} -CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/test_utils CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -.PATH: ${LIBARCHIVEDIR}/libarchive/test +.PATH: ${_LIBARCHIVEDIR}/libarchive/test TESTS_SRCS= \ test_acl_freebsd_nfs4.c \ test_acl_freebsd_posix1e.c \ @@ -249,12 +249,12 @@ SRCS.libarchive_test= \ LIBADD.libarchive_test= archive -.PATH: ${LIBARCHIVEDIR}/test_utils +.PATH: ${_LIBARCHIVEDIR}/test_utils SRCS.libarchive_test+= test_utils.c # list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines list.h: ${TESTS_SRCS} Makefile - @(cd ${LIBARCHIVEDIR}/libarchive/test && \ + @(cd ${_LIBARCHIVEDIR}/libarchive/test && \ grep -h DEFINE_TEST ${.ALLSRC:N*Makefile} | \ egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp @mv ${.TARGET}.tmp ${.TARGET} Modified: head/lib/libbsm/Makefile ============================================================================== --- head/lib/libbsm/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/lib/libbsm/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -3,12 +3,12 @@ # OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm -LIBBSMDIR= ${OPENBSMDIR}/libbsm +_LIBBSMDIR= ${OPENBSMDIR}/libbsm LIB= bsm SHLIB_MAJOR= 3 -.PATH: ${LIBBSMDIR} +.PATH: ${_LIBBSMDIR} .PATH: ${OPENBSMDIR}/bsm .PATH: ${OPENBSMDIR}/man @@ -31,7 +31,7 @@ SRCS= bsm_audit.c \ # # Must use BSM include files from within the contrib area, not the system. # -CFLAGS+= -I${OPENBSMDIR} -I${LIBBSMDIR} +CFLAGS+= -I${OPENBSMDIR} -I${_LIBBSMDIR} WARNS?= 1 Modified: head/lib/libc++/Makefile ============================================================================== --- head/lib/libc++/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/lib/libc++/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -2,7 +2,7 @@ .include <src.opts.mk> -LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt +_LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt HDRDIR= ${.CURDIR}/../../contrib/libc++/include SRCDIR= ${.CURDIR}/../../contrib/libc++/src CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR} @@ -52,12 +52,12 @@ CXXRT_SRCS+= libelftc_dem_gnu3.c\ .for _S in ${CXXRT_SRCS} STATICOBJS+= cxxrt_${_S:R}.o -cxxrt_${_S}: ${LIBCXXRTDIR}/${_S} .NOMETA +cxxrt_${_S}: ${_LIBCXXRTDIR}/${_S} .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .endfor WARNS= 0 -CFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -nostdlib -DLIBCXXRT +CFLAGS+= -I${HDRDIR} -I${_LIBCXXRTDIR} -nostdlib -DLIBCXXRT .if empty(CXXFLAGS:M-std=*) CXXFLAGS+= -std=c++11 .endif @@ -172,7 +172,7 @@ STD+= ${HDRDIR}/${hdr} INCSLINKS+= ${CXXINCLUDEDIR}/${hdr} ${CXXINCLUDEDIR}/tr1/${hdr} .endfor .for hdr in ${RT_HEADERS} -STD+= ${LIBCXXRTDIR}/${hdr} +STD+= ${_LIBCXXRTDIR}/${hdr} .endfor STDDIR= ${CXXINCLUDEDIR} Modified: head/lib/msun/Makefile ============================================================================== --- head/lib/msun/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/lib/msun/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -81,17 +81,16 @@ COMMON_SRCS= b_exp.c b_log.c b_tgamma.c w_cabs.c w_cabsf.c w_drem.c w_dremf.c # Location of fpmath.h and _fpmath.h -LIBCDIR= ${.CURDIR}/../libc -.if exists(${LIBCDIR}/${MACHINE_ARCH}) +.if exists(${LIBCSRCDIR}/${MACHINE_ARCH}) LIBC_ARCH=${MACHINE_ARCH} .else LIBC_ARCH=${MACHINE_CPUARCH} .endif -CFLAGS+= -I${.CURDIR}/src -I${LIBCDIR}/include \ - -I${LIBCDIR}/${LIBC_ARCH} +CFLAGS+= -I${.CURDIR}/src -I${LIBCSRCDIR}/include \ + -I${LIBCSRCDIR}/${LIBC_ARCH} SYM_MAPS+= ${.CURDIR}/Symbol.map -VERSION_DEF= ${LIBCDIR}/Versions.def +VERSION_DEF= ${LIBCSRCDIR}/Versions.def SYMBOL_MAPS= ${SYM_MAPS} # C99 long double functions Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/libexec/rtld-elf/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -13,9 +13,8 @@ SRCS= rtld_start.S \ malloc.c xmalloc.c debug.c libmap.c MAN= rtld.1 CSTD?= gnu99 -TOPSRCDIR= ${.CURDIR}/../.. CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -CFLAGS+= -I${TOPSRCDIR}/lib/csu/common +CFLAGS+= -I${SRCTOP}/lib/csu/common .if exists(${.CURDIR}/${MACHINE_ARCH}) RTLD_ARCH= ${MACHINE_ARCH} .else @@ -59,8 +58,7 @@ LIBADD+= compiler_rt .if ${MK_SYMVER} == "yes" -LIBCDIR= ${TOPSRCDIR}/lib/libc -VERSION_DEF= ${LIBCDIR}/Versions.def +VERSION_DEF= ${LIBCSRCDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map VERSION_MAP= Version.map LDFLAGS+= -Wl,--version-script=${VERSION_MAP} Modified: head/usr.bin/cpio/Makefile ============================================================================== --- head/usr.bin/cpio/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/usr.bin/cpio/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -2,21 +2,21 @@ .include <src.opts.mk> -LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive -LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive +_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive +_LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive PROG= bsdcpio BSDCPIO_VERSION_STRING= 3.1.2 -.PATH: ${LIBARCHIVEDIR}/cpio +.PATH: ${_LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c -.PATH: ${LIBARCHIVEDIR}/libarchive_fe +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c line_reader.c CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\" -CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_freebsd.h\" -CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe +CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\" +CFLAGS+= -I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/libarchive_fe .ifdef RELEASE_CRUNCH # FreeBSD's installer uses cpio in crunched binaries that are Modified: head/usr.bin/cpio/tests/Makefile ============================================================================== --- head/usr.bin/cpio/tests/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/usr.bin/cpio/tests/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -1,6 +1,6 @@ # $FreeBSD$ -LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test @@ -12,20 +12,20 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP} CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${.OBJDIR} -CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe -CFLAGS+= -I${LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/libarchive_fe +CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -.PATH: ${LIBARCHIVEDIR}/cpio +.PATH: ${_LIBARCHIVEDIR}/cpio CPIO_SRCS= cmdline.c -.PATH: ${LIBARCHIVEDIR}/libarchive_fe +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe CPIO_SRCS+= err.c -.PATH: ${LIBARCHIVEDIR}/cpio/test +.PATH: ${_LIBARCHIVEDIR}/cpio/test TESTS_SRCS= \ test_0.c \ test_basic.c \ @@ -75,13 +75,13 @@ SRCS.bsdcpio_test= list.h \ ${TESTS_SRCS} \ main.c -.PATH: ${LIBARCHIVEDIR}/test_utils +.PATH: ${_LIBARCHIVEDIR}/test_utils SRCS.bsdcpio_test+= test_utils.c LIBADD.bsdcpio_test= archive list.h: ${TESTS_SRCS} Makefile - @(cd ${LIBARCHIVEDIR}/tar/test && \ + @(cd ${_LIBARCHIVEDIR}/tar/test && \ grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp @mv ${.TARGET}.tmp ${.TARGET} Modified: head/usr.bin/tar/Makefile ============================================================================== --- head/usr.bin/tar/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/usr.bin/tar/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -1,12 +1,12 @@ # $FreeBSD$ .include <src.opts.mk> -LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive +_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive PROG= bsdtar BSDTAR_VERSION_STRING= 3.1.2 -.PATH: ${LIBARCHIVEDIR}/tar +.PATH: ${_LIBARCHIVEDIR}/tar SRCS= bsdtar.c \ cmdline.c \ creation_set.c \ @@ -15,7 +15,7 @@ SRCS= bsdtar.c \ util.c \ write.c -.PATH: ${LIBARCHIVEDIR}/libarchive_fe +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c \ line_reader.c @@ -27,8 +27,8 @@ CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config_freebsd.h\" -CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive -CFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe +CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/libarchive +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 Modified: head/usr.bin/tar/tests/Makefile ============================================================================== --- head/usr.bin/tar/tests/Makefile Tue Dec 1 22:19:17 2015 (r291619) +++ head/usr.bin/tar/tests/Makefile Tue Dec 1 22:20:04 2015 (r291620) @@ -1,6 +1,6 @@ # $FreeBSD$ -LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test @@ -9,7 +9,7 @@ BINDIR= ${TESTSDIR} CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -static CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} -CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc @@ -17,7 +17,7 @@ CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBA PROGS+= bsdtar_test -.PATH: ${LIBARCHIVEDIR}/tar/test +.PATH: ${_LIBARCHIVEDIR}/tar/test TESTS_SRCS= \ test_0.c \ test_basic.c \ @@ -75,13 +75,13 @@ SRCS.bsdtar_test= \ list.h \ main.c -.PATH: ${LIBARCHIVEDIR}/test_utils +.PATH: ${_LIBARCHIVEDIR}/test_utils SRCS.bsdtar_test+= test_utils.c LIBADD.bsdtar_test= archive list.h: ${TESTS_SRCS} Makefile - @(cd ${LIBARCHIVEDIR}/tar/test && \ + @(cd ${_LIBARCHIVEDIR}/tar/test && \ grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp @mv ${.TARGET}.tmp ${.TARGET}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512012220.tB1MK4EF013298>