summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-06-17 15:01:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 17:56:21 +0100
commitcb25932e731c212d059548bec727917b6d32ece5 (patch)
tree3916e12643810c26d0267b6aa25fca06a3d080a4
parent55c85889811c769aa841bd74b43294e1f982368f (diff)
downloadpoky-cb25932e731c212d059548bec727917b6d32ece5.tar.gz
libnewt/libnewt-python: upgrade to 0.52.17
- The company address has changed in COPYING. - Rebase fix_SHAREDDIR.patch to 0.52.17 - Rebase cross_ar.patch to 0.52.17 - Obsolete fix_python_fpic.patch, since the patch has been merged by upstream; - The upstream rename snackmodule to snack in 0.52.17, so tweak libnewt-python_0.52.17.bb; (From OE-Core rev: 46ec6e5601b88d4270d58586f25626349474d769) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/newt/files/cross_ar.patch19
-rw-r--r--meta/recipes-extended/newt/files/fix_SHAREDDIR.patch12
-rw-r--r--meta/recipes-extended/newt/files/fix_python_fpic.patch24
-rw-r--r--meta/recipes-extended/newt/libnewt-python_0.52.17.bb (renamed from meta/recipes-extended/newt/libnewt-python_0.52.14.bb)4
-rw-r--r--meta/recipes-extended/newt/libnewt_0.52.17.bb (renamed from meta/recipes-extended/newt/libnewt_0.52.14.bb)8
5 files changed, 29 insertions, 38 deletions
diff --git a/meta/recipes-extended/newt/files/cross_ar.patch b/meta/recipes-extended/newt/files/cross_ar.patch
index f67239abda..03007aa4f4 100644
--- a/meta/recipes-extended/newt/files/cross_ar.patch
+++ b/meta/recipes-extended/newt/files/cross_ar.patch
@@ -12,11 +12,13 @@ Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
12 12
13Upstream-Status: Pending 13Upstream-Status: Pending
14 14
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15--- 16---
16 Makefile.in | 3 ++- 17 Makefile.in | 3 ++-
17 configure.ac | 4 ++++ 18 configure.ac | 4 ++++
18 2 files changed, 6 insertions(+), 1 deletion(-) 19 2 files changed, 6 insertions(+), 1 deletion(-)
19 20
21diff --git a/Makefile.in b/Makefile.in
20--- a/Makefile.in 22--- a/Makefile.in
21+++ b/Makefile.in 23+++ b/Makefile.in
22@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ 24@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
@@ -27,8 +29,8 @@ Upstream-Status: Pending
27 29
28 VERSION = @VERSION@ 30 VERSION = @VERSION@
29 TAG = r$(subst .,-,$(VERSION)) 31 TAG = r$(subst .,-,$(VERSION))
30@@ -95,7 +96,7 @@ whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH) 32@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
31 $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) 33 $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
32 34
33 $(LIBNEWT): $(LIBOBJS) 35 $(LIBNEWT): $(LIBOBJS)
34- ar rv $@ $^ 36- ar rv $@ $^
@@ -36,12 +38,14 @@ Upstream-Status: Pending
36 38
37 newt.o $(SHAREDDIR)/newt.o: newt.c Makefile 39 newt.o $(SHAREDDIR)/newt.o: newt.c Makefile
38 40
41diff --git a/configure.ac b/configure.ac
42index 92e6da8..cd83d57 100644
39--- a/configure.ac 43--- a/configure.ac
40+++ b/configure.ac 44+++ b/configure.ac
41@@ -14,6 +14,10 @@ AC_PROG_CC 45@@ -15,6 +15,10 @@ AC_PROG_INSTALL
42 AC_PROG_INSTALL
43 AC_PROG_LN_S 46 AC_PROG_LN_S
44 AC_PROG_GREP 47 AC_PROG_GREP
48 AC_SYS_LARGEFILE
45+AN_MAKEVAR([AR], [AC_PROG_AR]) 49+AN_MAKEVAR([AR], [AC_PROG_AR])
46+AN_PROGRAM([ar], [AC_PROG_AR]) 50+AN_PROGRAM([ar], [AC_PROG_AR])
47+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) 51+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
@@ -49,3 +53,6 @@ Upstream-Status: Pending
49 53
50 # Are we using GNU ld? 54 # Are we using GNU ld?
51 AC_MSG_CHECKING([for GNU ld]) 55 AC_MSG_CHECKING([for GNU ld])
56--
571.8.1.2
58
diff --git a/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch b/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
index 7795260388..b0a1e8c105 100644
--- a/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
+++ b/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
@@ -9,17 +9,22 @@ ensure the directory ${SHAREDDIR} exists.
9We need to push the patch to upstream. 9We need to push the patch to upstream.
10 10
11Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> 11Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 Makefile.in | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
12 16
17diff --git a/Makefile.in b/Makefile.in
13--- a/Makefile.in 18--- a/Makefile.in
14+++ b/Makefile.in 19+++ b/Makefile.in
15@@ -114,12 +114,12 @@ 20@@ -128,12 +128,12 @@ $(SHAREDDIR):
16 21
17 sharedlib: $(LIBNEWTSH) 22 sharedlib: $(LIBNEWTSH)
18 23
19-$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS) 24-$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
20+$(LIBNEWTSH): $(SHAREDOBJS) 25+$(LIBNEWTSH): $(SHAREDOBJS)
21 $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS) 26 $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
22 ln -fs $(LIBNEWTSONAME) libnewt.so 27 ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
23 ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME) 28 ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
24 29
25-$(SHAREDDIR)/%.o : %.c 30-$(SHAREDDIR)/%.o : %.c
@@ -27,3 +32,6 @@ Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
27 $(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< 32 $(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
28 33
29 install: $(LIBNEWT) install-sh whiptail 34 install: $(LIBNEWT) install-sh whiptail
35--
361.8.1.2
37
diff --git a/meta/recipes-extended/newt/files/fix_python_fpic.patch b/meta/recipes-extended/newt/files/fix_python_fpic.patch
deleted file mode 100644
index 3ef94e0c56..0000000000
--- a/meta/recipes-extended/newt/files/fix_python_fpic.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Fix relocations warning when compile python module
2
3After enable python support in newt, bitbake complains warning:
4
5WARNING: QA Issue: ELF binary '/mnt/sda10/poky-all-platform/build/tmp/work/i586-poky-linux/libnewt/0.52.14-r2/packages-split/libnewt-python/usr/lib/python2.7/site-packages/_snackmodule.so' has relocations in .text
6
7Add flag -fPIC to compile _snackmodule.so to fix the warning.
8
9Signed-off-by: Kang Kai <kai.kang@windriver.com>
10
11Upstream-Status: Pending
12
13---
14--- newt-0.52.14/Makefile.in 2012-12-04 17:27:27.578915801 +0800
15+++ newt-0.52.14/Makefile.in.new 2012-12-04 17:28:43.274918472 +0800
16@@ -84,7 +84,7 @@
17 PIFLAGS=`$$ver-config --includes`; \
18 PLDFLAGS=`$$ver-config --ldflags`; \
19 PLFLAGS=`$$ver-config --libs`; \
20- $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
21+ $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
22 $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L. -lnewt $(LIBS);\
23 done || :
24 touch $@
diff --git a/meta/recipes-extended/newt/libnewt-python_0.52.14.bb b/meta/recipes-extended/newt/libnewt-python_0.52.17.bb
index 871b1958eb..d591fbd3d2 100644
--- a/meta/recipes-extended/newt/libnewt-python_0.52.14.bb
+++ b/meta/recipes-extended/newt/libnewt-python_0.52.17.bb
@@ -12,12 +12,12 @@ EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
12 12
13do_compile () { 13do_compile () {
14 VERSION="$(sed -n 's/^VERSION = //p' Makefile)" 14 VERSION="$(sed -n 's/^VERSION = //p' Makefile)"
15 oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snackmodule.so 15 oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snack.so
16} 16}
17 17
18do_install () { 18do_install () {
19 install -d ${D}${PYTHON_SITEPACKAGES_DIR} 19 install -d ${D}${PYTHON_SITEPACKAGES_DIR}
20 install -m 0755 ${PYTHON_DIR}/_snackmodule.so ${D}${PYTHON_SITEPACKAGES_DIR}/ 20 install -m 0755 ${PYTHON_DIR}/_snack.so ${D}${PYTHON_SITEPACKAGES_DIR}/
21 install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/ 21 install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/
22} 22}
23 23
diff --git a/meta/recipes-extended/newt/libnewt_0.52.14.bb b/meta/recipes-extended/newt/libnewt_0.52.17.bb
index 65bcf40428..09b017e24e 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.14.bb
+++ b/meta/recipes-extended/newt/libnewt_0.52.17.bb
@@ -12,7 +12,7 @@ HOMEPAGE = "https://fedorahosted.org/newt/"
12SECTION = "libs" 12SECTION = "libs"
13 13
14LICENSE = "LGPLv2" 14LICENSE = "LGPLv2"
15LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" 15LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
16 16
17# slang needs to be >= 2.2 17# slang needs to be >= 2.2
18DEPENDS = "slang popt" 18DEPENDS = "slang popt"
@@ -23,10 +23,10 @@ SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \
23 file://remove_slang_include.patch \ 23 file://remove_slang_include.patch \
24 file://fix_SHAREDDIR.patch \ 24 file://fix_SHAREDDIR.patch \
25 file://cross_ar.patch \ 25 file://cross_ar.patch \
26 file://fix_python_fpic.patch" 26"
27 27
28SRC_URI[md5sum] = "eb78c6bb658b92ec7198908b5b8d0e37" 28SRC_URI[md5sum] = "f36d4d908965a0c89fd6fd8b61a6118b"
29SRC_URI[sha256sum] = "f70f4f58baa60388ddf2e39249ffb00898fb40f2b2767e42e2ab51fe4b40978e" 29SRC_URI[sha256sum] = "69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b"
30 30
31S = "${WORKDIR}/newt-${PV}" 31S = "${WORKDIR}/newt-${PV}"
32 32