diff options
-rw-r--r-- | meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch | 29 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/ncurses_6.2.bb | 1 |
2 files changed, 30 insertions, 0 deletions
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 @@ | |||
1 | From 3b3e87934bb6d8511261d7c3d6e39b4f71849272 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nathan Rossi <nathan@nathanrossi.com> | ||
3 | Date: Mon, 14 Dec 2020 13:39:02 +1000 | ||
4 | Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc | ||
5 | files | ||
6 | |||
7 | Including the LDFLAGS in the pkgconfig output is problematic as OE | ||
8 | includes build host specific paths and options (e.g. uninative and | ||
9 | '-Wl,--dynamic-linker='). | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE Specific] | ||
12 | Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> | ||
13 | --- | ||
14 | misc/gen-pkgconfig.in | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in | ||
18 | index 8f00b824b9..009d215663 100644 | ||
19 | --- a/misc/gen-pkgconfig.in | ||
20 | +++ b/misc/gen-pkgconfig.in | ||
21 | @@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then | ||
22 | fi | ||
23 | |||
24 | lib_flags= | ||
25 | -for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ | ||
26 | +for opt in -L$libdir @LIBS@ | ||
27 | do | ||
28 | case $opt in | ||
29 | -l*) # LIBS is handled specially below | ||
diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb index 5c02db8541..76f0cf97f4 100644 --- a/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb | |||
@@ -2,6 +2,7 @@ require ncurses.inc | |||
2 | 2 | ||
3 | SRC_URI += "file://0001-tic-hang.patch \ | 3 | SRC_URI += "file://0001-tic-hang.patch \ |
4 | file://0002-configure-reproducible.patch \ | 4 | file://0002-configure-reproducible.patch \ |
5 | file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ | ||
5 | " | 6 | " |
6 | # commit id corresponds to the revision in package version | 7 | # commit id corresponds to the revision in package version |
7 | SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" | 8 | SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" |