Skip to contentSkip to conversation

pcp: Fix build to exclude qt5

PATCH New Khem Raj 1 participant 1 message Jan 11, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 pcp: Fix build to exclude qt5

Pass right options to ar

---
 meta-oe/recipes-support/pcp/pcp.inc           |  2 ++
 .../pcp/pcp/pass-options-to-AR.patch          | 29 +++++++++++++++++++
 meta-oe/recipes-support/pcp/pcp_5.3.5.bb      |  3 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch
meta-oe/recipes-support/pcp/pcp.inc +2 -0
index f6f111b0e8..d50e7b0910 100644
@@ -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 ?= ""
meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch new file +29 -0
new file mode 100644
index 0000000000..6fa864cd21
@@ -0,0 +1,29 @@
+Do not pass cr option
+
+These options are already coming from builddefs
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+
+--- 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
+ 
meta-oe/recipes-support/pcp/pcp_5.3.5.bb +2 -1
index 2dafab1b57..cdf506577a 100644
@@ -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"
Signature · 1 line
2.34.1