diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-01-11 11:25:26 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-01-11 17:51:55 -0800 |
| commit | 866715fa40b0c5f867add526dbe1d27ec2c1b66e (patch) | |
| tree | c0077c2b6c2e4931023c217f06c493ce664e0195 /meta-oe | |
| parent | adc35ac7145a8ed8fc934ad10a9a70c4e8f0ef5a (diff) | |
| download | meta-openembedded-contrib-866715fa40b0c5f867add526dbe1d27ec2c1b66e.tar.gz | |
pcp: Fix build to exclude qt5
Pass right options to ar
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Lei Maohui <leimaohui@fujitsu.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/pcp/pcp.inc | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch | 29 | ||||
| -rw-r--r-- | meta-oe/recipes-support/pcp/pcp_5.3.5.bb | 3 |
3 files changed, 33 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc index f6f111b0e8..d50e7b0910 100644 --- a/meta-oe/recipes-support/pcp/pcp.inc +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -29,4 +29,6 @@ EXTRA_OECONF:append = " --with-dstat-symlink=yes --with-infiniband=no \ --with-docdir=${docdir} \ " +PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d" +PACKAGECONFIG ?= "" diff --git a/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch b/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch new file mode 100644 index 0000000000..6fa864cd21 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch @@ -0,0 +1,29 @@ +Do not pass cr option + +These options are already coming from builddefs + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/include/builddefs.in ++++ b/src/include/builddefs.in +@@ -167,7 +167,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + + #NB: don't override $(MAKE); gnumake sets it well, propagating -j etc. + #MAKE = @make@ +-AR = @ar@ ++AR = @ar@ cqs + CC = @cc@ + CXX = @cxx@ + LD = @ld@ +--- a/src/include/buildrules ++++ b/src/include/buildrules +@@ -93,7 +93,7 @@ $(STATICLIBTARGET) : $(SUBDIRS) $(OBJECT + ifeq ($(TARGET_OS), darwin) + libtool -static -o $(STATICLIBTARGET) $? + else +- $(AR) cr $(STATICLIBTARGET) $? ++ $(AR) $(STATICLIBTARGET) $? + endif + endif + diff --git a/meta-oe/recipes-support/pcp/pcp_5.3.5.bb b/meta-oe/recipes-support/pcp/pcp_5.3.5.bb index 2dafab1b57..cdf506577a 100644 --- a/meta-oe/recipes-support/pcp/pcp_5.3.5.bb +++ b/meta-oe/recipes-support/pcp/pcp_5.3.5.bb @@ -11,11 +11,12 @@ DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptoo SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ + file://pass-options-to-AR.patch \ " export PCP_DIR="${RECIPE_SYSROOT_NATIVE}" #export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}" -EXTRA_OEMAKE = "CC="${CC}" LD="${LD}" AR="${AR}"" +EXTRA_OEMAKE = "CC="${CC}" LD="${LD}"" inherit useradd systemd SYSTEMD_AUTO_ENABLE:${PN} = "enable" |