summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-extended/newt
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-05-15 22:13:32 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-05-21 23:43:47 +0300
commitc182c62dd929fe69b57a12bc04099fcd09b5d436 (patch)
treea34e6d5c7dc6d91fc51f43b738099b458764e165 /poky/meta/recipes-extended/newt
parent7f40b7168b897da48694d6e71fd3fd45861bfb19 (diff)
downloadopenbmc-c182c62dd929fe69b57a12bc04099fcd09b5d436.tar.xz
poky: subtree update:b5763b2f48..f468a73523
Adrian Bunk (13): iproute2: Remove -fcommon libxcrypt2: Remove -fcommon xorg-xserver: Remove -fcommon mesa: Remove -fcommon at-spi2-atk: Remove -fcommon menu-cache: Replace -fcommon with fix matchbox-wm: Replace -fcommon with fix llvm: Remove -fcommon vte: Remove workaround for gcc 4.8 python-numpy: Remove workaround for host gcc < 5 libtasn1: Remove workaround for host gcc < 5 nettle: Remove workaround for gcc < 5 wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29 Alejandro Hernandez (1): connman: Include vpn-script in FILES Alexander Kanavin (30): libinput: add ptest libinput: update 1.15.2 -> 1.15.5 avahi: merge avahi-ui into the main recipe avahi: update to 0.8 testsdkext/devtool: initialize the test component's git repo git: update to 2.26.2 libcap: update to 2.33 libhandy: add a recipe from meta-oe libdazzle: update to 3.36.0 epiphany: update to 3.36.1 patchelf: switch to git powertop: switch to Arjan's git meson: fix upstream version check rpcsvc-proto: update to 1.4.1 vulkan-headers: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-loader: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-tools: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-demos: upgrade to latest revision e2fsprogs: update to 1.45.6 build-compare: update to latest revision ovmf: update to 202002 cdrtools-native: fix upstream version check re2c: correct upstream location vte: add icu dependency mesa: enable x11 for native/nativesdk runqemu: set host DRI driver path for all instances of virgl usage libepoxy: do not strip RUNPATH from native/nativesdk virgl: skip test on Debian 9 runqemu: force software x11 renderer for SDL when GL is not in use gcr: correct a build race between vapi files Andrej Valek (1): icu: upgrade 66.1 -> 67.1 Anton Eliasson (1): meson.bbclass: Close the log file after reading Bartosz Golaszewski (1): busybox: disable i2ctransfer Changqing Li (2): rpm: fix file conflicts for MIPS64 N32 lib/oe/package_manager: update default rpm config %_prefer_color Jacob Kroon (1): pseudo: Fix enum typedef Joe Slater (1): wget: improve reproducible build Joshua Watt (3): libnewt: Backport patch to fix reproducibility bitbake.conf: Prevent git from detecting parent repo in recipe classes/kernel: Generate reproducible kernel module tarball Kai Kang (1): python3-git: 3.0.5 -> 3.1.2 Khem Raj (9): avahi: Cover gtk packageconfig with x11/wayland distro features tunes: Add new tune files for cortexa55 and cortexa73-cortexa53 gcc-runtime: Avoid march conflicts with newer cortex-a55 CPUs gcc10: Update to GCC 10.1 Release glibc: Update to latest on 2.31 branch gcc10: Default back to -fcommon gcc10: Revert using __getauxval in libgcc glib-2.0: Fix stpcpy detection for mingw wayland: fix condition for strndup detection Konrad Weihmann (2): pypi.bbclass: mind package suffix on version check file: add PACKAGECONFIG for auto options Mingli Yu (1): python3-setuptools: add the missing rdepends Peter Kjellerstedt (2): sstate.bbclass: Do not fail if files cannot be touched file: Remove unneccessary override of PACKAGECONFIG for native Pierre-Jean Texier (1): sysklogd: upgrade 2.1.1 -> 2.1.2 Richard Leitner (6): gdbm: add patch to fix link failure against gcc 10 dtc: update to 1.6.0 libtirpc: remove extra "-fcommon" from CFLAGS libcomps: update to 0.1.15 binutils: add patch to fix issues with gcc 10 cpio: add patch to fix issues with gcc 10 Richard Purdie (4): recipes: Remove remaining INC_PR variables insane: Promote warnings into errors poky: We now match OE-Core's error/warning config so simplify poky.conf: Post release version bump Robert P. J. Day (1): documentation.conf: Add variables supported by features_check.bbclass Tim Orling (1): pypi.bbclass: use new pypi UPSTREAM_CHECK_URI Wang Mingyu (1): nettle: upgrade 3.5.1 -> 3.6 Yeoh Ee Peng (1): selftest/imagefeatures: Enable sanity test for IMAGE_GEN_DEBUGFS Yi Zhao (1): opkg-keyrings: check if opkg-key exists before run postinst Zoltan Boszormenyi (4): libva: Factor out base parts into an include file libva-initial: New bootstrap recipe mesa: Add PACKAGECONFIG knob to enable VAAPI mesa: Add PACKAGECONFIG knob to enable VDPAU state tracker and drivers jan (1): scripts/tiny/ksize: Fix for more recent kernels wenlin.kang@windriver.com (1): populate_sdk_base.bbclass: fix warning: name not matched Change-Id: Icd73153270a6cb7ab63257211350aa564867c2db Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-extended/newt')
-rw-r--r--poky/meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch29
-rw-r--r--poky/meta/recipes-extended/newt/files/pie-flags.patch41
-rw-r--r--poky/meta/recipes-extended/newt/libnewt_0.52.21.bb4
3 files changed, 31 insertions, 43 deletions
diff --git a/poky/meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch b/poky/meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch
new file mode 100644
index 000000000..ca235d510
--- /dev/null
+++ b/poky/meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch
@@ -0,0 +1,29 @@
+From f60dc1063607ca1f201ba4cbda467d8af3f78f64 Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <mlichvar@redhat.com>
+Date: Tue, 1 Oct 2019 16:37:55 +0200
+Subject: [PATCH] don't ignore CFLAGS when building snack
+
+In addition to the flags returned by python-config --cflags, use the
+user-specified CFLAGS when building the snack object.
+
+Upstream-Status: Backport from master
+Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index be5f87b..6facd5e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -96,8 +96,8 @@ _snack.$(SOEXT): snack.c $(LIBNEWTSH)
+ PIFLAGS=`$$pyconfig --includes`; \
+ PLDFLAGS=`$$pyconfig --ldflags`; \
+ PLFLAGS=`$$pyconfig --libs`; \
+- echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+- $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
++ echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
++ $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+ 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 || :
diff --git a/poky/meta/recipes-extended/newt/files/pie-flags.patch b/poky/meta/recipes-extended/newt/files/pie-flags.patch
deleted file mode 100644
index 92f5b2503..000000000
--- a/poky/meta/recipes-extended/newt/files/pie-flags.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
-| collect2: error: ld returned 1 exit status
-| make: *** [libnewt.so.0.52.18] Error 1
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
----
- 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`; \
- PLFLAGS=`$$pyconfig --libs`; \
-- echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
-- $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
-+ echo $(CC) $(CPPFLAGS) $(SHCFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
-+ $(CC) $(CPPFLAGS) $(SHCFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
- 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 || :
-@@ -133,7 +133,7 @@ $(LIBNEWTSH): $(SHAREDOBJS)
-
- $(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
-
diff --git a/poky/meta/recipes-extended/newt/libnewt_0.52.21.bb b/poky/meta/recipes-extended/newt/libnewt_0.52.21.bb
index 09b61be61..88b4cf4a0 100644
--- a/poky/meta/recipes-extended/newt/libnewt_0.52.21.bb
+++ b/poky/meta/recipes-extended/newt/libnewt_0.52.21.bb
@@ -20,9 +20,9 @@ DEPENDS = "slang popt python3"
SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
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 \
-"
+ file://0002-don-t-ignore-CFLAGS-when-building-snack.patch \
+ "
SRC_URI[md5sum] = "a0a5fd6b53bb167a65e15996b249ebb5"
SRC_URI[sha256sum] = "265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31"