diff options
Diffstat (limited to 'meta-oe/recipes-extended/newt/files')
-rw-r--r-- | meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-extended/newt/files/cross_ar.patch | 25 |
2 files changed, 14 insertions, 40 deletions
diff --git a/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch b/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch deleted file mode 100644 index 090ed5c1c9..0000000000 --- a/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Wed, 21 Sep 2016 21:14:40 +0200 | ||
4 | Subject: [PATCH] detect gold as GNU linker too | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | |||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 468c718..cd93f30 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *]) | ||
22 | AC_MSG_CHECKING([for GNU ld]) | ||
23 | LD=$($CC -print-prog-name=ld 2>&5) | ||
24 | |||
25 | -if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then | ||
26 | +if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ") = 0; then | ||
27 | # Not | ||
28 | GNU_LD="" | ||
29 | AC_MSG_RESULT([no]) | ||
diff --git a/meta-oe/recipes-extended/newt/files/cross_ar.patch b/meta-oe/recipes-extended/newt/files/cross_ar.patch index 86cc0be1d3..eb8c4134b2 100644 --- a/meta-oe/recipes-extended/newt/files/cross_ar.patch +++ b/meta-oe/recipes-extended/newt/files/cross_ar.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Fix cross link using autoconf detected AR | 1 | From 0f33421000006f5991d1cddcb9dbc68b64141e44 Mon Sep 17 00:00:00 2001 |
2 | From: Jason Wessel <jason.wessel@windriver.com> | ||
3 | Date: Wed, 19 Jun 2024 11:22:48 +0200 | ||
4 | Subject: [PATCH] Fix cross link using autoconf detected AR | ||
2 | 5 | ||
3 | If building on 32bit host and creating 64bit libraries, the target | 6 | If building on 32bit host and creating 64bit libraries, the target |
4 | package builds should not invoke the 32bit hosts's ar. Specifically | 7 | package builds should not invoke the 32bit hosts's ar. Specifically |
@@ -18,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
18 | configure.ac | 4 ++++ | 21 | configure.ac | 4 ++++ |
19 | 2 files changed, 6 insertions(+), 1 deletion(-) | 22 | 2 files changed, 6 insertions(+), 1 deletion(-) |
20 | 23 | ||
21 | Index: newt-0.52.20/Makefile.in | 24 | diff --git a/Makefile.in b/Makefile.in |
22 | =================================================================== | 25 | index f8fe290..8a44a56 100644 |
23 | --- newt-0.52.20.orig/Makefile.in | 26 | --- a/Makefile.in |
24 | +++ newt-0.52.20/Makefile.in | 27 | +++ b/Makefile.in |
25 | @@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ | 28 | @@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ |
26 | LDFLAGS = @LDFLAGS@ | 29 | LDFLAGS = @LDFLAGS@ |
27 | CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ | 30 | CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ |
@@ -30,7 +33,7 @@ Index: newt-0.52.20/Makefile.in | |||
30 | 33 | ||
31 | VERSION = @VERSION@ | 34 | VERSION = @VERSION@ |
32 | TAG = r$(subst .,-,$(VERSION)) | 35 | TAG = r$(subst .,-,$(VERSION)) |
33 | @@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE | 36 | @@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH) |
34 | $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) | 37 | $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) |
35 | 38 | ||
36 | $(LIBNEWT): $(LIBOBJS) | 39 | $(LIBNEWT): $(LIBOBJS) |
@@ -39,11 +42,11 @@ Index: newt-0.52.20/Makefile.in | |||
39 | 42 | ||
40 | newt.o $(SHAREDDIR)/newt.o: newt.c Makefile | 43 | newt.o $(SHAREDDIR)/newt.o: newt.c Makefile |
41 | 44 | ||
42 | Index: newt-0.52.20/configure.ac | 45 | diff --git a/configure.ac b/configure.ac |
43 | =================================================================== | 46 | index 434121e..2cfffd6 100644 |
44 | --- newt-0.52.20.orig/configure.ac | 47 | --- a/configure.ac |
45 | +++ newt-0.52.20/configure.ac | 48 | +++ b/configure.ac |
46 | @@ -15,6 +15,10 @@ AC_PROG_INSTALL | 49 | @@ -15,6 +15,10 @@ AC_PROG_CC |
47 | AC_PROG_LN_S | 50 | AC_PROG_LN_S |
48 | AC_PROG_GREP | 51 | AC_PROG_GREP |
49 | AC_SYS_LARGEFILE | 52 | AC_SYS_LARGEFILE |