diff options
Diffstat (limited to 'meta/recipes-extended/newt/files')
-rw-r--r-- | meta/recipes-extended/newt/files/cross_ar.patch | 58 | ||||
-rw-r--r-- | meta/recipes-extended/newt/files/fix_SHAREDDIR.patch | 37 | ||||
-rw-r--r-- | meta/recipes-extended/newt/files/remove_slang_include.patch | 16 |
3 files changed, 111 insertions, 0 deletions
diff --git a/meta/recipes-extended/newt/files/cross_ar.patch b/meta/recipes-extended/newt/files/cross_ar.patch new file mode 100644 index 0000000000..03007aa4f4 --- /dev/null +++ b/meta/recipes-extended/newt/files/cross_ar.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | Fix cross link using autoconf detected AR | ||
2 | |||
3 | If building on 32bit host and creating 64bit libraries, the target | ||
4 | package builds should not invoke the 32bit hosts's ar. Specifically | ||
5 | you will get an error message like: | ||
6 | |||
7 | x86_64-linux-gcc -m64 --sysroot=/opt/qemux86-64/tmp/sysroots/qemux86-64 -g -o test test.o libnewt.a -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -lslang | ||
8 | libnewt.a: could not read symbols: Archive has no index; run ranlib to add one | ||
9 | collect2: error: ld returned 1 exit status | ||
10 | |||
11 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | --- | ||
17 | Makefile.in | 3 ++- | ||
18 | configure.ac | 4 ++++ | ||
19 | 2 files changed, 6 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/Makefile.in b/Makefile.in | ||
22 | --- a/Makefile.in | ||
23 | +++ b/Makefile.in | ||
24 | @@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ | ||
25 | LDFLAGS = @LDFLAGS@ | ||
26 | CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ | ||
27 | GNU_LD = @GNU_LD@ | ||
28 | +AR = @AR@ | ||
29 | |||
30 | VERSION = @VERSION@ | ||
31 | TAG = r$(subst .,-,$(VERSION)) | ||
32 | @@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH) | ||
33 | $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) | ||
34 | |||
35 | $(LIBNEWT): $(LIBOBJS) | ||
36 | - ar rv $@ $^ | ||
37 | + $(AR) rv $@ $^ | ||
38 | |||
39 | newt.o $(SHAREDDIR)/newt.o: newt.c Makefile | ||
40 | |||
41 | diff --git a/configure.ac b/configure.ac | ||
42 | index 92e6da8..cd83d57 100644 | ||
43 | --- a/configure.ac | ||
44 | +++ b/configure.ac | ||
45 | @@ -15,6 +15,10 @@ AC_PROG_INSTALL | ||
46 | AC_PROG_LN_S | ||
47 | AC_PROG_GREP | ||
48 | AC_SYS_LARGEFILE | ||
49 | +AN_MAKEVAR([AR], [AC_PROG_AR]) | ||
50 | +AN_PROGRAM([ar], [AC_PROG_AR]) | ||
51 | +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) | ||
52 | +AC_PROG_AR | ||
53 | |||
54 | # Are we using GNU ld? | ||
55 | AC_MSG_CHECKING([for GNU ld]) | ||
56 | -- | ||
57 | 1.8.1.2 | ||
58 | |||
diff --git a/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch b/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch new file mode 100644 index 0000000000..b0a1e8c105 --- /dev/null +++ b/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Author: dexuan.cui@intel.com | ||
4 | Date: Fri Apr 15 16:17:39 CST 2011 | ||
5 | |||
6 | The patch fixes a parallel-make issue: when generating $(SHAREDDIR)/%.o, we should | ||
7 | ensure the directory ${SHAREDDIR} exists. | ||
8 | |||
9 | We need to push the patch to upstream. | ||
10 | |||
11 | Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> | ||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
13 | --- | ||
14 | Makefile.in | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile.in b/Makefile.in | ||
18 | --- a/Makefile.in | ||
19 | +++ b/Makefile.in | ||
20 | @@ -128,12 +128,12 @@ $(SHAREDDIR): | ||
21 | |||
22 | sharedlib: $(LIBNEWTSH) | ||
23 | |||
24 | -$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS) | ||
25 | +$(LIBNEWTSH): $(SHAREDOBJS) | ||
26 | $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS) | ||
27 | ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT) | ||
28 | ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME) | ||
29 | |||
30 | -$(SHAREDDIR)/%.o : %.c | ||
31 | +$(SHAREDDIR)/%.o : %.c $(SHAREDDIR) | ||
32 | $(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< | ||
33 | |||
34 | install: $(LIBNEWT) install-sh whiptail | ||
35 | -- | ||
36 | 1.8.1.2 | ||
37 | |||
diff --git a/meta/recipes-extended/newt/files/remove_slang_include.patch b/meta/recipes-extended/newt/files/remove_slang_include.patch new file mode 100644 index 0000000000..a2634ec75b --- /dev/null +++ b/meta/recipes-extended/newt/files/remove_slang_include.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | |||
2 | Upstream-Status: Pending | ||
3 | |||
4 | Index: git/Makefile.in | ||
5 | =================================================================== | ||
6 | --- git.orig/Makefile.in | ||
7 | +++ git/Makefile.in | ||
8 | @@ -5,7 +5,7 @@ CC = @CC@ | ||
9 | CPP = @CPP@ | ||
10 | CFLAGS = @CFLAGS@ | ||
11 | LDFLAGS = @LDFLAGS@ | ||
12 | -CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ | ||
13 | +CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ | ||
14 | GNU_LD = @GNU_LD@ | ||
15 | |||
16 | VERSION = @VERSION@ | ||