From: Daniel Dickinson <crazycshore@gmail.com>
Date: Mon, 4 Apr 2011 19:42:45 +0000 (+0000)
Subject: [libs] newt: Fixed cross-compilation error due to attempt to use host Python by disab... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=a107e62676c3014b671a5c2e6d7a52c9c74a85da

[libs] newt: Fixed cross-compilation error due to attempt to use host Python by disabling build of snackmodule (a python module) which we weren't shipping anyway.

SVN-Revision: 26474
---

diff --git a/libs/newt/patches/110-disable-snackmodule-python.patch b/libs/newt/patches/110-disable-snackmodule-python.patch
new file mode 100644
index 0000000000..d0435550a8
--- /dev/null
+++ b/libs/newt/patches/110-disable-snackmodule-python.patch
@@ -0,0 +1,45 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,7 +50,7 @@ else
+ TARGET=depend $(PROGS)
+ endif
+ 
+-all:	$(TARGET) _snackmodule.so
++all:	$(TARGET)
+ 
+ test:	test.o $(LIBNEWT)
+ 	$(CC) $(CFLAGS) -g -o test test.o $(LIBNEWT) $(LIBS)
+@@ -67,14 +67,6 @@ showchars:	showchars.o $(LIBNEWT)
+ showkey:	showkey.o $(LIBNEWT)
+ 	$(CC) $(CFLAGS) -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
+ 
+-_snackmodule.so:   snackmodule.c $(LIBNEWTSH)
+-	for ver in $(PYTHONVERS) ; do \
+-	    	mkdir -p $$ver ;\
+-	        $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o $$ver/snackmodule.o snackmodule.c ;\
+-		$(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L .  -lnewt ;\
+-	done
+-	touch $@
+-
+ whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
+ 	$(CC) $(CFLAGS) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt
+ 
+@@ -121,17 +113,12 @@ install: $(LIBNEWT) install-sh whiptail
+ 	make -C po datadir=$(instroot)/$(datadir) install
+ 	install -m 644 -D libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc
+ 
+-install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
++install-sh: sharedlib $(WHIPTCLSO)
+ 	[ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
+ 	install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
+ 	ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so
+ 	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
+ 	[ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || :
+-	for ver in $(PYTHONVERS) ; do \
+-	   [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
+-	   install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\
+-	   install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
+-	done
+ 
+ Makefile: newt.spec
+ 	echo "You need to rerun ./configure before continuing"