| Message ID | 20190907183517.6176-1-alexander.i.mukhin@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/pppd: use uclibc libcrypt instead of openssl | expand |
On Sat, 7 Sep 2019 21:35:17 +0300 Alexander Mukhin <alexander.i.mukhin@gmail.com> wrote: > glibc since 2.28 dropped DES encryption routines setkey() and encrypt(), > but uclibc still provides them. So, if building with uclibc, we can > avoid using huge openssl library. > > Signed-off-by: Alexander Mukhin <alexander.i.mukhin@gmail.com> I've applied, after doing one small change, see below. > +PPPD_MAKE_OPTS = HAVE_INET6=y > +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) > PPPD_DEPENDENCIES = openssl I changed this to PPPD_DEPENDENCIES += instead of PPPD_DEPENDENCIES =. Indeed, we're now in a conditional block, and we want to avoid overwriting any PPPD_DEPENDENCIES assignment that could have been done before that. There is none in the current pppd.mk, but one could be added in the future, so we really like to use += to add conditional dependencies. Thanks for your contribution! Thomas
diff --git a/package/pppd/Config.in b/package/pppd/Config.in index bf05689f53..7db5674bf1 100644 --- a/package/pppd/Config.in +++ b/package/pppd/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_PPPD depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL # Use __P() macro all over the tree depends on BR2_USE_MMU - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if BR2_TOOLCHAIN_USES_GLIBC help An implementation of the Point-to-point protocol. diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 4dffc17941..be6c443eec 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -12,10 +12,14 @@ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c +PPPD_MAKE_OPTS = HAVE_INET6=y +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) PPPD_DEPENDENCIES = openssl -PPPD_MAKE_OPTS = \ - HAVE_INET6=y \ - OPENSSL_INCLUDE_DIR=$(STAGING_DIR)/usr/include/openssl +PPPD_MAKE_OPTS += OPENSSL_INCLUDE_DIR=$(STAGING_DIR)/usr/include/openssl +else +PPPD_MAKE_OPTS += USE_CRYPT=y +endif + PPPD_INSTALL_STAGING = YES PPPD_TARGET_BINS = chat pppd pppdump pppstats PPPD_RADIUS_CONF = \
glibc since 2.28 dropped DES encryption routines setkey() and encrypt(), but uclibc still provides them. So, if building with uclibc, we can avoid using huge openssl library. Signed-off-by: Alexander Mukhin <alexander.i.mukhin@gmail.com> --- package/pppd/Config.in | 2 +- package/pppd/pppd.mk | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)