summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2019-08-09 09:48:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-13 09:37:37 +0100
commitd1100db5eb6ae18339dd7944cf9c52238790247b (patch)
tree80a8d2549964fb0e01be0dc999caf370cc3b1d9f /meta/recipes-extended
parentd90fb2a87e69df8bdba07227f7a876c501ad93bf (diff)
downloadpoky-d1100db5eb6ae18339dd7944cf9c52238790247b.tar.gz
libnewt:upgrade 0.52.20 -> 0.52.21
-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>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/newt/files/fix_SHAREDDIR.patch37
-rw-r--r--meta/recipes-extended/newt/files/pie-flags.patch27
-rw-r--r--meta/recipes-extended/newt/libnewt_0.52.21.bb (renamed from meta/recipes-extended/newt/libnewt_0.52.20.bb)5
3 files changed, 18 insertions, 51 deletions
diff --git a/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch b/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
deleted file mode 100644
index b0a1e8c105..0000000000
--- a/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Upstream-Status: Pending
2
3Author: dexuan.cui@intel.com
4Date: Fri Apr 15 16:17:39 CST 2011
5
6The patch fixes a parallel-make issue: when generating $(SHAREDDIR)/%.o, we should
7ensure the directory ${SHAREDDIR} exists.
8
9We need to push the patch to upstream.
10
11Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 Makefile.in | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --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--
361.8.1.2
37
diff --git a/meta/recipes-extended/newt/files/pie-flags.patch b/meta/recipes-extended/newt/files/pie-flags.patch
index 8883e26adf..92f5b2503b 100644
--- a/meta/recipes-extended/newt/files/pie-flags.patch
+++ b/meta/recipes-extended/newt/files/pie-flags.patch
@@ -1,7 +1,4 @@
1specify -fPIC after CFLAGS so it can override the CFLAGS containing -pie and -fpie 1specify -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
2this makes sure the objects that go into shared objects are compiled with -fPIC
3and not with -fpie. We can not use -fpie on objects which will go into .so files
4Fixes errors like
5 2
6| /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 3| /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
7| /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 4| /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
10 7
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Upstream-Status: Pending 9Upstream-Status: Pending
13Index: newt-0.52.18/Makefile.in 10
14=================================================================== 11---
15--- newt-0.52.18.orig/Makefile.in 12 Makefile.in | 6 +++---
16+++ newt-0.52.18/Makefile.in 13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/Makefile.in b/Makefile.in
16index be5f87b..88ee0b7 100644
17--- a/Makefile.in
18+++ b/Makefile.in
17@@ -96,8 +96,8 @@ _snack.$(SOEXT): snack.c $(LIBNEWTSH) 19@@ -96,8 +96,8 @@ _snack.$(SOEXT): snack.c $(LIBNEWTSH)
18 PIFLAGS=`$$pyconfig --includes`; \ 20 PIFLAGS=`$$pyconfig --includes`; \
19 PLDFLAGS=`$$pyconfig --ldflags`; \ 21 PLDFLAGS=`$$pyconfig --ldflags`; \
@@ -25,12 +27,15 @@ Index: newt-0.52.18/Makefile.in
25 echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ 27 echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
26 $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ 28 $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
27 done || : 29 done || :
28@@ -135,7 +135,7 @@ $(LIBNEWTSH): $(SHAREDOBJS) 30@@ -133,7 +133,7 @@ $(LIBNEWTSH): $(SHAREDOBJS)
29 ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
30 31
31 $(SHAREDDIR)/%.o : %.c $(SHAREDDIR) 32 $(SHAREDDIR)/%.o : %.c
33 @mkdir -p $(SHAREDDIR)
32- $(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< 34- $(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
33+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(SHCFLAGS) -o $@ $< 35+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(SHCFLAGS) -o $@ $<
34 36
35 install: $(LIBNEWT) install-sh whiptail 37 install: $(LIBNEWT) install-sh whiptail
36 [ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir) 38 [ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir)
39--
402.7.4
41
diff --git a/meta/recipes-extended/newt/libnewt_0.52.20.bb b/meta/recipes-extended/newt/libnewt_0.52.21.bb
index dc07a1809e..09b61be61d 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.20.bb
+++ b/meta/recipes-extended/newt/libnewt_0.52.21.bb
@@ -18,15 +18,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
18DEPENDS = "slang popt python3" 18DEPENDS = "slang popt python3"
19 19
20SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ 20SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
21 file://fix_SHAREDDIR.patch \
22 file://cross_ar.patch \ 21 file://cross_ar.patch \
23 file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ 22 file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \
24 file://pie-flags.patch \ 23 file://pie-flags.patch \
25 file://0001-detect-gold-as-GNU-linker-too.patch \ 24 file://0001-detect-gold-as-GNU-linker-too.patch \
26" 25"
27 26
28SRC_URI[md5sum] = "70b288f821234593a8e7920e435b259b" 27SRC_URI[md5sum] = "a0a5fd6b53bb167a65e15996b249ebb5"
29SRC_URI[sha256sum] = "8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc" 28SRC_URI[sha256sum] = "265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31"
30 29
31S = "${WORKDIR}/newt-${PV}" 30S = "${WORKDIR}/newt-${PV}"
32 31