From 9019323ec1109d636b6e2ca9fe991dce45635f96 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 17 Jul 2018 20:21:39 +0200 Subject: [PATCH] ppp: fix building pptp plugin The pptp.so plugin needs to be built with -fPIC as well in order to be linkable again. Fixes 888a15ff83 ("ppp: add missing -fPIC to rp-pppoe.so CFLAGS") Fixes e7397eef69 ("ppp: compile with LTO enabled") Signed-off-by: Jo-Philipp Wich --- package/network/services/ppp/Makefile | 2 +- .../services/ppp/patches/511-pptp_cflags.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 package/network/services/ppp/patches/511-pptp_cflags.patch diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index 60c07565f3..9fbee90f12 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp PKG_VERSION:=2.4.7 -PKG_RELEASE:=12 +PKG_RELEASE:=13 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.samba.org/pub/ppp/ diff --git a/package/network/services/ppp/patches/511-pptp_cflags.patch b/package/network/services/ppp/patches/511-pptp_cflags.patch new file mode 100644 index 0000000000..548bf41c1f --- /dev/null +++ b/package/network/services/ppp/patches/511-pptp_cflags.patch @@ -0,0 +1,11 @@ +--- a/pppd/plugins/pptp/Makefile.linux ++++ b/pppd/plugins/pptp/Makefile.linux +@@ -20,7 +20,7 @@ all: pptp.so + $(CC) $(CFLAGS) -c -o $@ $< + + pptp.so: dirutil.o orckit_quirks.o pptp.o pptp_callmgr.o pptp_ctrl.o pptp_quirks.o util.o vector.o +- $(CC) -o pptp.so -shared dirutil.o orckit_quirks.o pptp.o pptp_callmgr.o pptp_ctrl.o pptp_quirks.o util.o vector.o ++ $(CC) -fPIC -o pptp.so -shared dirutil.o orckit_quirks.o pptp.o pptp_callmgr.o pptp_ctrl.o pptp_quirks.o util.o vector.o + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) -- 2.25.1