mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

libnewt:upgrade 0.52.20 -> 0.52.21

Browse Source 
-Refresh the following patch:
	files/pie-flags.patch

-files/fix_SHAREDDIR.patch
 Removed since this is included in 0.52.21.

(From OE-Core rev: 5b7fd7a945f8eeece51f01ad20a6de12fea89433)

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Zang Ruochen
2019-08-09 09:48:37 +08:00
committed by Richard Purdie
parent d90fb2a87e
commit d1100db5eb
3 changed files with 18 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
View File

@@ -1,37 +0,0 @@
Upstream-Status: Pending
Author: dexuan.cui@intel.com
Date: Fri Apr 15 16:17:39 CST 2011
The patch fixes a parallel-make issue: when generating $(SHAREDDIR)/%.o, we should
ensure the directory ${SHAREDDIR} exists.
We need to push the patch to upstream.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -128,12 +128,12 @@ $(SHAREDDIR):
sharedlib: $(LIBNEWTSH)
-$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
+$(LIBNEWTSH): $(SHAREDOBJS)
$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
-$(SHAREDDIR)/%.o : %.c
+$(SHAREDDIR)/%.o : %.c $(SHAREDDIR)
$(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
install: $(LIBNEWT) install-sh whiptail
--
1.8.1.2

27
meta/recipes-extended/newt/files/pie-flags.patch
View File

@@ -1,7 +1,4 @@
specify -fPIC after CFLAGS so it can override the CFLAGS containing -pie and -fpie
this makes sure the objects that go into shared objects are compiled with -fPIC
and not with -fpie. We can not use -fpie on objects which will go into .so files
Fixes errors like
specify -fPIC after CFLAGS so it can override the CFLAGS containing -pie and -fpie this makes sure the objects that go into shared objects are compiled with -fPIC and not with -fpie. We can not use -fpie on objects which will go into .so files Fixes errors like
| /mnt/oe/build/tmp-glibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/5.3.0/ld: shared/newt.o: relocation R_X86_64_PC32 against undefined symbol `SLtt_Screen_Rows@@SLANG2' can not be used when making a shared object; recompile with -fPIC
| /mnt/oe/build/tmp-glibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/5.3.0/ld: final link failed: Bad value
@@ -10,10 +7,15 @@ Fixes errors like
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: newt-0.52.18/Makefile.in
===================================================================
--- newt-0.52.18.orig/Makefile.in
+++ newt-0.52.18/Makefile.in
---
Makefile.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index be5f87b..88ee0b7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,8 +96,8 @@ _snack.$(SOEXT): snack.c $(LIBNEWTSH)
PIFLAGS=`$$pyconfig --includes`; \
PLDFLAGS=`$$pyconfig --ldflags`; \
@@ -25,12 +27,15 @@ Index: newt-0.52.18/Makefile.in
echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
done || :
@@ -135,7 +135,7 @@ $(LIBNEWTSH): $(SHAREDOBJS)
ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
@@ -133,7 +133,7 @@ $(LIBNEWTSH): $(SHAREDOBJS)
$(SHAREDDIR)/%.o : %.c $(SHAREDDIR)
$(SHAREDDIR)/%.o : %.c
@mkdir -p $(SHAREDDIR)
- $(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(SHCFLAGS) -o $@ $<
install: $(LIBNEWT) install-sh whiptail
[ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir)
--
2.7.4

5
meta/recipes-extended/newt/libnewt_0.52.20.bb → meta/recipes-extended/newt/libnewt_0.52.21.bb
View File

@@ -18,15 +18,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
DEPENDS = "slang popt python3"
SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
file://fix_SHAREDDIR.patch \
file://cross_ar.patch \
file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \
file://pie-flags.patch \
file://0001-detect-gold-as-GNU-linker-too.patch \
"
SRC_URI[md5sum] = "70b288f821234593a8e7920e435b259b"
SRC_URI[sha256sum] = "8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc"
SRC_URI[md5sum] = "a0a5fd6b53bb167a65e15996b249ebb5"
SRC_URI[sha256sum] = "265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31"
S = "${WORKDIR}/newt-${PV}"