diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-07-17 11:23:42 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-07-17 11:23:42 +0000 |
| commit | 7ab7fa23831fbefb37a927f836e71bdb985666af (patch) | |
| tree | 0d4b6c6ae0d404d8b01d4567487e7ffa0d1a2d31 | |
| parent | d6f31dba045573c5aef4b9417170d1d869889416 (diff) | |
| download | ptxdist-7ab7fa23831fbefb37a927f836e71bdb985666af.tar.gz ptxdist-7ab7fa23831fbefb37a927f836e71bdb985666af.tar.xz | |
[ppp] remove ppp-2.4.4-undefined-main.diff patch
it breaks creation of the plugins, which are shared object not just
plain objects.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10972 33e552b5-05e3-0310-8538-816dae2090ed
| -rw-r--r-- | patches/ppp-2.4.4/ppp-2.4.4-undefined-main.diff | 28 | ||||
| -rw-r--r-- | patches/ppp-2.4.4/series | 1 |
2 files changed, 0 insertions, 29 deletions
diff --git a/patches/ppp-2.4.4/ppp-2.4.4-undefined-main.diff b/patches/ppp-2.4.4/ppp-2.4.4-undefined-main.diff deleted file mode 100644 index 75649221d..000000000 --- a/patches/ppp-2.4.4/ppp-2.4.4-undefined-main.diff +++ /dev/null @@ -1,28 +0,0 @@ -Subject: pppd: undefined main -From: Robert Schwebel <r.schwebel@pengutronix.de> - -When compiling this code, gcc barfs here: - -/some/path/../sysroot-arm-v4t-linux-gnueabi/usr/lib/crt1.o: In function `_start': -init.c:(.text+0x30): undefined reference to `main' - -So we add a -c switch to the Makefile. - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> ---- - pppd/plugins/Makefile.linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: pppd/plugins/Makefile.linux -=================================================================== ---- pppd/plugins/Makefile.linux.orig -+++ pppd/plugins/Makefile.linux -@@ -23,7 +23,7 @@ all: $(PLUGINS) - for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done - - %.so: %.c -- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ -+ $(CC) -o $@ $(LDFLAGS) $(CFLAGS) -c $^ - - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) - diff --git a/patches/ppp-2.4.4/series b/patches/ppp-2.4.4/series index b7353cebf..fefc94af3 100644 --- a/patches/ppp-2.4.4/series +++ b/patches/ppp-2.4.4/series @@ -1,5 +1,4 @@ ppp-2.4.4-makefile-sysroot.diff -p0 -ppp-2.4.4-undefined-main.diff -p0 ppp-2.4.4-detect-crypt.diff -p0 ppp-2.4.4-cross-awareness.diff -p0 ppp-2.4.4-close-ppp-properly.diff -p0 |