diff options
| author | Kang Kai <kai.kang@windriver.com> | 2011-07-28 17:28:42 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-04 15:04:29 +0100 |
| commit | dde02ad31e46a7f42cfd0374b3421d52a4b54eaf (patch) | |
| tree | 2dab8455ea1e939df933c38a6e503d64db5b9c7e /meta/recipes-extended/newt/files/include-without-python.patch | |
| parent | c5c9c53c4e736d491d0baf01c94a76099acd4f6f (diff) | |
| download | poky-dde02ad31e46a7f42cfd0374b3421d52a4b54eaf.tar.gz | |
libnewt: update to 0.52.13
Update libnewt to 0.52.13, and remove include-without-python.patch
because it has been merged.
Update SRC_URI and add SRC_URI checksum.
(From OE-Core rev: b83284d2be47019e1ca122ce4a2b1a077e7c3174)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/newt/files/include-without-python.patch')
| -rw-r--r-- | meta/recipes-extended/newt/files/include-without-python.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-extended/newt/files/include-without-python.patch b/meta/recipes-extended/newt/files/include-without-python.patch deleted file mode 100644 index 263e9de039..0000000000 --- a/meta/recipes-extended/newt/files/include-without-python.patch +++ /dev/null | |||
| @@ -1,73 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
| 5 | Date: Thu, 20 Jan 2011 14:14:51 -0200 | ||
| 6 | Subject: [PATCH] build: add -without-python | ||
| 7 | |||
| 8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 9 | --- | ||
| 10 | Makefile.in | 8 ++++---- | ||
| 11 | configure.ac | 10 ++++++++-- | ||
| 12 | 2 files changed, 12 insertions(+), 6 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/Makefile.in b/Makefile.in | ||
| 15 | index e764e61..74e9097 100644 | ||
| 16 | --- a/Makefile.in | ||
| 17 | +++ b/Makefile.in | ||
| 18 | @@ -77,7 +77,7 @@ showkey: showkey.o $(LIBNEWT) | ||
| 19 | $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS) | ||
| 20 | |||
| 21 | _snackmodule.so: snackmodule.c $(LIBNEWTSH) | ||
| 22 | - for ver in $(PYTHONVERS) ; do \ | ||
| 23 | + [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \ | ||
| 24 | mkdir -p $$ver ;\ | ||
| 25 | PCFLAGS=`$$ver-config --cflags`; \ | ||
| 26 | PIFLAGS=`$$ver-config --includes`; \ | ||
| 27 | @@ -85,7 +85,7 @@ _snackmodule.so: snackmodule.c $(LIBNEWTSH) | ||
| 28 | PLFLAGS=`$$ver-config --libs`; \ | ||
| 29 | $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\ | ||
| 30 | $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L. -lnewt $(LIBS);\ | ||
| 31 | - done | ||
| 32 | + done || : | ||
| 33 | touch $@ | ||
| 34 | |||
| 35 | whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) | ||
| 36 | @@ -141,11 +141,11 @@ install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so | ||
| 37 | ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so | ||
| 38 | ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME) | ||
| 39 | [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || : | ||
| 40 | - for ver in $(PYTHONVERS) ; do \ | ||
| 41 | + [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \ | ||
| 42 | [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\ | ||
| 43 | install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\ | ||
| 44 | install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\ | ||
| 45 | - done | ||
| 46 | + done || : | ||
| 47 | |||
| 48 | Makefile: newt.spec | ||
| 49 | echo "You need to rerun ./configure before continuing" | ||
| 50 | diff --git a/configure.ac b/configure.ac | ||
| 51 | index 7bc381a..dc04352 100644 | ||
| 52 | --- a/configure.ac | ||
| 53 | +++ b/configure.ac | ||
| 54 | @@ -54,8 +54,14 @@ fi | ||
| 55 | AC_CHECK_HEADERS([popt.h libintl.h]) | ||
| 56 | |||
| 57 | AC_MSG_CHECKING([for python versions]) | ||
| 58 | -PYTHONVERS=$(echo /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null) | ||
| 59 | -AC_MSG_RESULT([$PYTHONVERS]) | ||
| 60 | +AC_ARG_WITH([python], [ --without-python do not compile python support]) | ||
| 61 | +if test "x$with_python" = "xno"; then | ||
| 62 | + AC_MSG_RESULT([skipped]) | ||
| 63 | + PYTHONVERS= | ||
| 64 | +else | ||
| 65 | + PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null) | ||
| 66 | + AC_MSG_RESULT([$PYTHONVERS]) | ||
| 67 | +fi | ||
| 68 | AC_SUBST([PYTHONVERS]) | ||
| 69 | |||
| 70 | AC_ARG_WITH([tcl], [ --without-tcl do not compile whiptcl.so]) | ||
| 71 | -- | ||
| 72 | 1.7.2.3 | ||
| 73 | |||
