From f0d5be8303d402b120bd3797f148c3ceabdca2c3 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 24 Mar 2016 08:25:05 +0000 Subject: Install a usable mailer.conf for dragonfly mailer agent if sendmail is disabled --- libexec/dma/dmagent/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libexec') diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile index 6f7e8b0648edc..187517736e627 100644 --- a/libexec/dma/dmagent/Makefile +++ b/libexec/dma/dmagent/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + LIBADD= ssl crypto PROG= dma @@ -22,6 +24,11 @@ YFLAGS+= -i CLEANFILES= aliases_parse.i FILES= mailer.conf FILESDIR= ${SHAREDIR}/examples/dma +.if ${MK_SENDMAIL} == no +CONFGROUPS= CONFS MAILER +MAILERDIR= /etc/mail +MAILER= mailer.conf +.endif BINMODE= 2555 -- cgit v1.3 From 05e7782363b5b745026b47653a4ea5c4741c2361 Mon Sep 17 00:00:00 2001 From: Alexander Kabaev Date: Sun, 27 Mar 2016 23:19:14 +0000 Subject: Do not override top level CFLAGS in libexec/dma --- libexec/dma/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libexec') diff --git a/libexec/dma/Makefile.inc b/libexec/dma/Makefile.inc index e9a0d0a1c6148..5d8cfc2c3e194 100644 --- a/libexec/dma/Makefile.inc +++ b/libexec/dma/Makefile.inc @@ -4,7 +4,7 @@ DMA_SOURCES= ${.CURDIR}/../../../contrib/dma .PATH: ${DMA_SOURCES} -CFLAGS= -I${DMA_SOURCES} \ +CFLAGS+= -I${DMA_SOURCES} \ -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \ -DCONF_PATH='"/etc/dma"' \ -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.10"' \ -- cgit v1.3 From c0f5aeb0329d71e6b02379133c0c9c0145c9afea Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Thu, 31 Mar 2016 17:27:01 +0000 Subject: WITHOUT_TOOLCHAIN: Fix build of rtld. MK_TOOLCHAIN==no disables building and installing of pic archives. c_pic.a is still needed for rtld though so force it to build in lib/libc and link directly to the objdir version of it for rtld. Somehow this has been broken since r148725. Sponsored by: EMC / Isilon Storage Division --- lib/libc/Makefile | 3 +++ libexec/rtld-elf/Makefile | 3 +++ 2 files changed, 6 insertions(+) (limited to 'libexec') diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 707fc1a46a186..8b3f201cd06a5 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -5,6 +5,9 @@ SHLIBDIR?= /lib .include +# Force building of libc_pic.a +MK_TOOLCHAIN= yes + LIBC_SRCTOP?= ${.CURDIR} # Pick the current architecture directory for libc. In general, this is diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index ae49e9bd75a37..60e08afe867f9 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -45,6 +45,9 @@ CFLAGS+= -fvisibility=hidden .endif LDFLAGS+= -shared -Wl,-Bsymbolic LIBADD= c_pic +.if ${MK_TOOLCHAIN} == "no" +LDFLAGS+= -L${LIBCDIR} +.endif .if ${MACHINE_CPUARCH} == "arm" # Some of the required math functions (div & mod) are implemented in -- cgit v1.3