mirror of
https://git.yoctoproject.org/poky
synced 2026-05-29 15:52:40 +02:00
3c02fc2788
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 8820d4ffa493d49212f4d8f2665d15c7070a7477) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
Fix cross link using autoconf detected AR
|
|
|
|
If building on 32bit host and creating 64bit libraries, the target
|
|
package builds should not invoke the 32bit hosts's ar. Specifically
|
|
you will get an error message like:
|
|
|
|
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
|
|
libnewt.a: could not read symbols: Archive has no index; run ranlib to add one
|
|
collect2: error: ld returned 1 exit status
|
|
|
|
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
Makefile.in | 3 ++-
|
|
configure.ac | 4 ++++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
Index: newt-0.52.20/Makefile.in
|
|
===================================================================
|
|
--- newt-0.52.20.orig/Makefile.in
|
|
+++ newt-0.52.20/Makefile.in
|
|
@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
|
|
LDFLAGS = @LDFLAGS@
|
|
CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
|
|
GNU_LD = @GNU_LD@
|
|
+AR = @AR@
|
|
|
|
VERSION = @VERSION@
|
|
TAG = r$(subst .,-,$(VERSION))
|
|
@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE
|
|
$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
|
|
|
|
$(LIBNEWT): $(LIBOBJS)
|
|
- ar rv $@ $^
|
|
+ $(AR) rv $@ $^
|
|
|
|
newt.o $(SHAREDDIR)/newt.o: newt.c Makefile
|
|
|
|
Index: newt-0.52.20/configure.ac
|
|
===================================================================
|
|
--- newt-0.52.20.orig/configure.ac
|
|
+++ newt-0.52.20/configure.ac
|
|
@@ -15,6 +15,10 @@ AC_PROG_INSTALL
|
|
AC_PROG_LN_S
|
|
AC_PROG_GREP
|
|
AC_SYS_LARGEFILE
|
|
+AN_MAKEVAR([AR], [AC_PROG_AR])
|
|
+AN_PROGRAM([ar], [AC_PROG_AR])
|
|
+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
|
|
+AC_PROG_AR
|
|
|
|
AC_CHECK_SIZEOF([long])
|
|
AC_CHECK_SIZEOF([long long])
|