summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/newt/files/cross_ar.patch
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 /meta/recipes-extended/newt/files/cross_ar.patch
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>
Diffstat (limited to 'meta/recipes-extended/newt/files/cross_ar.patch')
-rw-r--r--meta/recipes-extended/newt/files/cross_ar.patch19
1 files changed, 13 insertions, 6 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