svn commit: r235654 - in head: bin/ed share/mk
Bjoern A. Zeeb
bz at FreeBSD.org
Sat May 19 18:22:49 UTC 2012
On 19. May 2012, at 17:55 , Marcel Moolenaar wrote:
> Author: marcel
> Date: Sat May 19 17:55:49 2012
> New Revision: 235654
> URL: http://svn.freebsd.org/changeset/base/235654
>
> Log:
> Add build option MK_ED_CRYPTO to control whether ed(1) is to have the
> ability to encrypt/decrypt files. Embedded systems can typically have
> OpenSSL, but not for ed(1) to use it.
This is totally wrong in my view and lacks documentation.
1) I really see no reason why ED needs it's own crypto flag for src.conf,
if we go that route what about telnet, and all the others?
2) If I do not build with OPENSSL this should as well turn off MK_ED_CRYPTO
automatically (but let's not go there, if avoidable).
3) if you insist on keeping it as a src.conf option please fix (2) and
properly document it.
>
> Obtained from: Juniper Networks, Inc.
>
> Modified:
> head/bin/ed/Makefile
> head/share/mk/bsd.own.mk
>
> Modified: head/bin/ed/Makefile
> ==============================================================================
> --- head/bin/ed/Makefile Sat May 19 17:49:20 2012 (r235653)
> +++ head/bin/ed/Makefile Sat May 19 17:55:49 2012 (r235654)
> @@ -7,12 +7,12 @@ SRCS= buf.c cbc.c glbl.c io.c main.c re.
> LINKS= ${BINDIR}/ed ${BINDIR}/red
> MLINKS= ed.1 red.1
>
> -.if !defined(RELEASE_CRUNCH)
> -.if ${MK_OPENSSL} != "no"
> +.if !defined(RELEASE_CRUNCH) && \
> + ${MK_OPENSSL} != "no" && \
> + ${MK_ED_CRYPTO} != "no"
> CFLAGS+=-DDES
> DPADD= ${LIBCRYPTO}
> LDADD= -lcrypto
> .endif
> -.endif
>
> .include <bsd.prog.mk>
>
> Modified: head/share/mk/bsd.own.mk
> ==============================================================================
> --- head/share/mk/bsd.own.mk Sat May 19 17:49:20 2012 (r235653)
> +++ head/share/mk/bsd.own.mk Sat May 19 17:55:49 2012 (r235654)
> @@ -334,6 +334,7 @@ __DEFAULT_YES_OPTIONS = \
> CXX \
> DICT \
> DYNAMICROOT \
> + ED_CRYPTO \
> EXAMPLES \
> FLOPPY \
> FORTH \
--
Bjoern A. Zeeb You have to have visions!
It does not matter how good you are. It matters what good you do!
More information about the svn-src-all
mailing list