* ppp: make ppp cross compilable

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7684 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 61 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f246a180..f700ae801 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2008-01-01 Robert Schwebel <r.schwebel@pengutronix.de>
 
+	* ppp: make ppp cross compilable
 	* rsync3: added rsync 3.0.0pre7 in order to test
 	the new and probably less memory consuming algorithms
 	* xkbcomp: fixed dependency to xorg-lib-xkbfile.
diff --git a/patches/ppp-2.4.4/generic/ppp-2.4.4-detect-crypt.diff b/patches/ppp-2.4.4/generic/ppp-2.4.4-detect-crypt.diff
new file mode 100644
index 000000000..c9be5fd0b
--- /dev/null
+++ b/patches/ppp-2.4.4/generic/ppp-2.4.4-detect-crypt.diff
@@ -0,0 +1,29 @@
+Subject: pppd: add crypt options if crypt is switched on
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+
+Activate the crypt options (CFLAGS, LIBS) if USE_CRYPT is selected. The
+current method is a bad idea, because it relies on the crypt.h header
+being installed in a special place, which might not be the case.
+
+The proper solution would probably be a real autotoolization of the
+packet, with checks for availability in configure.ac.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ pppd/Makefile.linux |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: pppd/Makefile.linux
+===================================================================
+--- pppd/Makefile.linux.orig
++++ pppd/Makefile.linux
+@@ -117,7 +117,7 @@ CFLAGS   += -DHAS_SHADOW
+ #LIBS     += -lshadow $(LIBS)
+ endif
+ 
+-ifneq ($(wildcard $(SYSROOT)/usr/include/crypt.h),)
++ifdef USE_CRYPT
+ CFLAGS  += -DHAVE_CRYPT_H=1
+ LIBS	+= -lcrypt
+ endif
diff --git a/patches/ppp-2.4.4/generic/pppd_makefile-sysroot.diff b/patches/ppp-2.4.4/generic/ppp-2.4.4-makefile-sysroot.diff
index 4bb78017d..4bb78017d 100644
--- a/patches/ppp-2.4.4/generic/pppd_makefile-sysroot.diff
+++ b/patches/ppp-2.4.4/generic/ppp-2.4.4-makefile-sysroot.diff
diff --git a/patches/ppp-2.4.4/generic/ppp-2.4.4-undefined-main.diff b/patches/ppp-2.4.4/generic/ppp-2.4.4-undefined-main.diff
new file mode 100644
index 000000000..75649221d
--- /dev/null
+++ b/patches/ppp-2.4.4/generic/ppp-2.4.4-undefined-main.diff
@@ -0,0 +1,28 @@
+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/generic/series b/patches/ppp-2.4.4/generic/series
index 901aaf724..e553f2cc4 100644
--- a/patches/ppp-2.4.4/generic/series
+++ b/patches/ppp-2.4.4/generic/series
@@ -1 +1,3 @@
-pppd_makefile-sysroot.diff
+ppp-2.4.4-makefile-sysroot.diff
+ppp-2.4.4-undefined-main.diff -p0
+ppp-2.4.4-detect-crypt.diff -p0