mirror of
https://git.yoctoproject.org/poky
synced 2026-09-13 09:49:32 +02:00
ossp-uuid, libffi, libgcrypt: Pass --tag=CC option to libtool
libtool tries to guess the --tag value based on CC/CXX environment variables and the compile commandline generated by makefiles. This heuristics however fails when we construct CC variables in OE and add security flags to it, especially -fPIE -pie which are added by external compilers e.g. clang particularly. It fails because libtool removed PIE flags from compiler cmdline intelligently if it figures out that its building a library, which means that the CC variable passed from cmdline does not match with the compiler cmdline constructed by libtool and we end up with errors like | arm-bec-linux-musleabi-libtool: compile: unable to infer tagged configuration | arm-bec-linux-musleabi-libtool: error: specify a tag with '--tag' This works with internal gcc toolchain because we configure gcc for PIE when hardening is selected and dont pass -fPIE -pie options explicitly but this is not an option for clang, and some external gcc toolchains using older gcc This patch adds the --tag option to help libtool set correct tags in packages where it cant get it right via its heuristics (From OE-Core rev: 0505075ae8d339ba097aebb82b4d0ae62f87c0a9) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
21
meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch
Normal file
21
meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
Repect LIBTOOLFLAGS
|
||||||
|
|
||||||
|
This add a knob that can be controlled from env to set generic options
|
||||||
|
for libtool
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
Index: uuid-1.6.2/Makefile.in
|
||||||
|
===================================================================
|
||||||
|
--- uuid-1.6.2.orig/Makefile.in
|
||||||
|
+++ uuid-1.6.2/Makefile.in
|
||||||
|
@@ -56,7 +56,7 @@ RM = rm -f
|
||||||
|
CP = cp
|
||||||
|
RMDIR = rmdir
|
||||||
|
SHTOOL = $(S)/shtool
|
||||||
|
-LIBTOOL = @LIBTOOL@
|
||||||
|
+LIBTOOL = @LIBTOOL@ $(LIBTOOLFLAGS)
|
||||||
|
TRUE = true
|
||||||
|
POD2MAN = pod2man
|
||||||
|
PERL = @PERL@
|
||||||
@@ -27,6 +27,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/
|
|||||||
file://uuid-nostrip.patch \
|
file://uuid-nostrip.patch \
|
||||||
file://install-pc.patch \
|
file://install-pc.patch \
|
||||||
file://ldflags.patch \
|
file://ldflags.patch \
|
||||||
|
file://libtool-tag.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f"
|
SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f"
|
||||||
SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
|
SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
|
||||||
@@ -37,6 +38,7 @@ inherit autotools update-alternatives
|
|||||||
|
|
||||||
EXTRA_OECONF = "--without-dce --without-cxx --without-perl --without-perl-compat --without-php --without-pgsql"
|
EXTRA_OECONF = "--without-dce --without-cxx --without-perl --without-perl-compat --without-php --without-pgsql"
|
||||||
EXTRA_OECONF = "--includedir=${includedir}/ossp"
|
EXTRA_OECONF = "--includedir=${includedir}/ossp"
|
||||||
|
EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'"
|
||||||
|
|
||||||
do_configure_prepend() {
|
do_configure_prepend() {
|
||||||
# This package has a completely custom aclocal.m4, which should be acinclude.m4.
|
# This package has a completely custom aclocal.m4, which should be acinclude.m4.
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
|
|||||||
SRC_URI[sha256sum] = "d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"
|
SRC_URI[sha256sum] = "d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"
|
||||||
|
|
||||||
EXTRA_OECONF += "--disable-builddir"
|
EXTRA_OECONF += "--disable-builddir"
|
||||||
|
EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'"
|
||||||
inherit autotools texinfo
|
inherit autotools texinfo
|
||||||
|
|
||||||
FILES_${PN}-dev += "${libdir}/libffi-${PV}"
|
FILES_${PN}-dev += "${libdir}/libffi-${PV}"
|
||||||
@@ -30,3 +30,4 @@ FILES_${PN}-dev += "${libdir}/libffi-${PV}"
|
|||||||
MIPS_INSTRUCTION_SET = "mips"
|
MIPS_INSTRUCTION_SET = "mips"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native nativesdk"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ BINCONFIG = "${bindir}/libgcrypt-config"
|
|||||||
inherit autotools texinfo binconfig-disabled pkgconfig
|
inherit autotools texinfo binconfig-disabled pkgconfig
|
||||||
|
|
||||||
EXTRA_OECONF = "--disable-asm"
|
EXTRA_OECONF = "--disable-asm"
|
||||||
|
EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'"
|
||||||
|
|
||||||
PACKAGECONFIG ??= "capabilities"
|
PACKAGECONFIG ??= "capabilities"
|
||||||
PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap"
|
PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap"
|
||||||
|
|||||||
Reference in New Issue
Block a user