diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-26 15:08:23 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-26 15:08:25 +0200 |
| commit | e9842ba8bd961d49f70996931ade77fbb7912d9c (patch) | |
| tree | 30d8158fea1c682ba05960243ada43c53fdd4e65 | |
| parent | f404814dbe319081de4068551b984bbcd89dbfff (diff) | |
| download | ptxdist-e9842ba8bd961d49f70996931ade77fbb7912d9c.tar.gz ptxdist-e9842ba8bd961d49f70996931ade77fbb7912d9c.tar.xz | |
ppp: improve sysroot patch
Make sure that the openssl headers are found and that no system include
path is used.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/ppp-2.4.7/0100-pppd-make-makefile-sysroot-aware.patch | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/patches/ppp-2.4.7/0100-pppd-make-makefile-sysroot-aware.patch b/patches/ppp-2.4.7/0100-pppd-make-makefile-sysroot-aware.patch index 565a315f1..d5924f373 100644 --- a/patches/ppp-2.4.7/0100-pppd-make-makefile-sysroot-aware.patch +++ b/patches/ppp-2.4.7/0100-pppd-make-makefile-sysroot-aware.patch @@ -5,15 +5,17 @@ Subject: [PATCH] pppd: make makefile sysroot aware The pppd Makefile is not SYSROOT aware. This patch replaces all occurrences of absolute paths by their corresponding SYSROOT relative ones. +Skip the 'wildcard' check completely. Libcrypt is always needed anyways. Signed-off-by: Marc Kleine-Budde <m.kleine-budde@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - pppd/Makefile.linux | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) + pppd/Makefile.linux | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 4d536f84c7ba..b6e2ddbd9306 100644 +index 4d536f84c7ba..30eb12f9d11d 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux @@ -100,8 +100,8 @@ endif @@ -39,3 +41,12 @@ index 4d536f84c7ba..b6e2ddbd9306 100644 ifdef USE_LIBUTIL CFLAGS += -DHAVE_LOGWTMP=1 +@@ -137,7 +135,7 @@ endif + + ifdef NEEDDES + ifndef USE_CRYPT +-CFLAGS += -I/usr/include/openssl ++CFLAGS += -I$(SYSROOT)/usr/include/openssl + LIBS += -lcrypto + else + CFLAGS += -DUSE_CRYPT=1 |