[Modulinux-commits] SF.net SVN: modulinux:[14] trunk/scripts

[<ser...@us...>]

Revision: 14
          http://modulinux.svn.sourceforge.net/modulinux/?rev=14&view=rev
Author:   serisman
Date:     2009-12-16 06:30:38 +0000 (Wed, 16 Dec 2009)

Log Message:
-----------
a few minor bug fixes

Modified Paths:
--------------
    trunk/scripts/foundation/libnl/libnl.mk

Added Paths:
-----------
    trunk/scripts/toolchain/libc/uclibc/0.9.30.1/getline.patch

Modified: trunk/scripts/foundation/libnl/libnl.mk
===================================================================
--- trunk/scripts/foundation/libnl/libnl.mk	2009-12-15 06:20:13 UTC (rev 13)
+++ trunk/scripts/foundation/libnl/libnl.mk	2009-12-16 06:30:38 UTC (rev 14)
@@ -55,14 +55,10 @@
 	$(INSTALL) -D -m 0755 -s $(FOUNDATION_LIBNL_BUILD_DIR)/lib/.libs/libnl-nf.so.$(FOUNDATION_LIBNL_VERSION).0 $(RELEASE_DIR)/lib
 	$(INSTALL) -D -m 0755 -s $(FOUNDATION_LIBNL_BUILD_DIR)/lib/.libs/libnl-route.so.$(FOUNDATION_LIBNL_VERSION).0 $(RELEASE_DIR)/lib
 	(cd $(RELEASE_DIR)/lib; \
-		ln -s -f libnl.so.$(FOUNDATION_LIBNL_VERSION).0 libnl.so.2; \
-		ln -s -f libnl.so.2 libnl.so; \
-		ln -s -f libnl-genl.so.$(FOUNDATION_LIBNL_VERSION).0 libnl-genl.so.2; \
-		ln -s -f libnl-genl.so.2 libnl-genl.so; \
-		ln -s -f libnl-nf.so.$(FOUNDATION_LIBNL_VERSION).0 libnl-nf.so.2; \
-		ln -s -f libnl-nf.so.2 libnl-nf.so; \
-		ln -s -f libnl-route.so.$(FOUNDATION_LIBNL_VERSION).0 libnl-route.so.2; \
-		ln -s -f libnl-route.so.2 libnl-route.so; \
+		ln -s -f libnl.so.$(FOUNDATION_LIBNL_VERSION).0 libnl.so; \
+		ln -s -f libnl-genl.so.$(FOUNDATION_LIBNL_VERSION).0 libnl-genl.so; \
+		ln -s -f libnl-nf.so.$(FOUNDATION_LIBNL_VERSION).0 libnl-nf.so; \
+		ln -s -f libnl-route.so.$(FOUNDATION_LIBNL_VERSION).0 libnl-route.so; \
 	);
 	$(LOG) foundation-libnl installation has completed.
 	touch $@

Added: trunk/scripts/toolchain/libc/uclibc/0.9.30.1/getline.patch
===================================================================
--- trunk/scripts/toolchain/libc/uclibc/0.9.30.1/getline.patch	                        (rev 0)
+++ trunk/scripts/toolchain/libc/uclibc/0.9.30.1/getline.patch	2009-12-16 06:30:38 UTC (rev 14)
@@ -0,0 +1,30 @@
+diff -u old/extra/scripts/unifdef.c uClibc-0.9.30.1/extra/scripts/unifdef.c
+--- old/extra/scripts/unifdef.c	2008-04-27 18:10:00.000000000 -0500
++++ uClibc-0.9.30.1/extra/scripts/unifdef.c	2009-12-15 23:37:54.271377997 -0600
+@@ -206,7 +206,7 @@
+ static void             error(const char *);
+ static int              findsym(const char *);
+ static void             flushline(bool);
+-static Linetype         getline(void);
++static Linetype         parseline(void);
+ static Linetype         ifeval(const char **);
+ static void             ignoreoff(void);
+ static void             ignoreon(void);
+@@ -512,7 +512,7 @@
+ 
+ 	for (;;) {
+ 		linenum++;
+-		lineval = getline();
++		lineval = parseline();
+ 		trans_table[ifstate[depth]][lineval]();
+ 		debug("process %s -> %s depth %d",
+ 		    linetype_name[lineval],
+@@ -526,7 +526,7 @@
+  * help from skipcomment().
+  */
+ static Linetype
+-getline(void)
++parseline(void)
+ {
+ 	const char *cp;
+ 	int cursym;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.