[Buildroot] [git commit branch/2019.02.x] package/pppd: use uclibc libcrypt instead of openssl
Peter Korsgaard
peter at korsgaard.com
Sun Mar 15 10:48:07 UTC 2020
commit: https://git.buildroot.net/buildroot/commit/?id=f012854abbdb23960ad578ee3c2bebd49e0ac27e
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2019.02.x
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 at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
(cherry picked from commit b519bcafe75d1256d1fc42aa26393405b89629b3)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
package/pppd/Config.in | 2 +-
package/pppd/pppd.mk | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
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..29e52be978 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_DEPENDENCIES = openssl
-PPPD_MAKE_OPTS = \
- HAVE_INET6=y \
- OPENSSL_INCLUDE_DIR=$(STAGING_DIR)/usr/include/openssl
+PPPD_MAKE_OPTS = HAVE_INET6=y
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
+PPPD_DEPENDENCIES += 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 = \
More information about the buildroot
mailing list