From 50f4e82e4e79f115122f34762150bf1c754e3cf4 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 15 Dec 2020 08:32:00 +0000 Subject: ncurses: Prevent LDFLAGS being emitted in .pc files By default ncurses includes the values of LDFLAGS in its output pkgconfig .pc files. This causes issues because OE includes options that are specific to either the build host, or build configuration. These options are not expected to be embedded in the pkgconfig output that is installed. Specifically this change resolves issues with uninative, where uninative includes '-Wl,--dynamic-linker=' in LDFLAGS in order to force the building and execution of native binaries against the dynamic linker provided by uninative. This path is specific to TMPDIR at the time of build, such that the installed files (and the associated sstate) have this path. This prevents the sstate from being portable across build directories/hosts. (From OE-Core rev: ef960d14bd9cecb9a3b50994636fbd455f06104a) Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- ...ig.in-Do-not-include-LDFLAGS-in-generated.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch (limited to 'meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch') diff --git a/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch new file mode 100644 index 0000000000..1eb17767a0 --- /dev/null +++ b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch @@ -0,0 +1,29 @@ +From 3b3e87934bb6d8511261d7c3d6e39b4f71849272 Mon Sep 17 00:00:00 2001 +From: Nathan Rossi +Date: Mon, 14 Dec 2020 13:39:02 +1000 +Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc + files + +Including the LDFLAGS in the pkgconfig output is problematic as OE +includes build host specific paths and options (e.g. uninative and +'-Wl,--dynamic-linker='). + +Upstream-Status: Inappropriate [OE Specific] +Signed-off-by: Nathan Rossi +--- + misc/gen-pkgconfig.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in +index 8f00b824b9..009d215663 100644 +--- a/misc/gen-pkgconfig.in ++++ b/misc/gen-pkgconfig.in +@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then + fi + + lib_flags= +-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ ++for opt in -L$libdir @LIBS@ + do + case $opt in + -l*) # LIBS is handled specially below -- cgit v1.2.3-54-g00ecf