CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xerces-c: fix buildpaths QA issue

Browse Source 
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa 2024-08-30 12:05:57 +02:00 committed by Khem Raj
parent 7e8a786c29
commit bbcb7d6023
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch Normal file
View File

@ -0,0 +1,58 @@
From d001f12d428f7adaeaadee5263a22c797c99d67b Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Fri, 30 Aug 2024 11:42:27 +0200
Subject: [PATCH] aclocal.m4: don't use full path of $with_curl in xerces-c.pc
* fixes:
ERROR: QA Issue: File /usr/lib32/pkgconfig/xerces-c.pc in package lib32-libxerces-c-dev contains reference to TMPDIR [buildpaths]
* xerces-c was blacklisted due to tmpdir since 2016:
https://git.openembedded.org/meta-openembedded/commit/?id=1af196e42c811947bb483df30bfce758adee83d1
* then sed call:
sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc
was added to do_install:append and blacklist dropped in:
https://git.openembedded.org/meta-openembedded/commit/?id=87b9efff79e62f569525e4760adc594d0d9ac476
* sed call was adjusted in:
https://git.openembedded.org/meta-openembedded/commit/?id=87c9e9537dc43468a6aaf706853b784ce6de14e0
sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc
* but it was still failing in some cases, e.g. with multilib where libdir is /usr/lib64, so the sed call is:
sed -i s:-L{WORKDIR}/recipe-sysroot/usr/lib64::g ${WORKDIR}/build/xerces-c.pc
but the actual xerces-c.pc file still has:
Libs: -L${libdir} -lxerces-c
Libs.private: -L${WORKDIR}/recipe-sysroot/usr/lib -lcurl
because this aclocal was always hardcoding "lib" (appended to --with-curl
value which is passed together with ${prefix}) and not respecting the libdir value:
PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl"
PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu"
* xerces-c supports CMake since 2017:
https://github.com/apache/xerces-c/commit/2606b2924c3e2bf0cf50f72b79378721b6bcf04e
switching from autotools to CMake would probably resolve some of this as well
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
Upstream-Status: Pending [It would be better to just switch to CMake]
m4/xerces_curl_prefix.m4 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/m4/xerces_curl_prefix.m4 b/m4/xerces_curl_prefix.m4
index d1d015c..7928bdc 100644
--- a/m4/xerces_curl_prefix.m4
+++ b/m4/xerces_curl_prefix.m4
@@ -39,8 +39,8 @@ AC_DEFUN([XERCES_CURL_PREFIX],
curl_libs=`$curl_config --libs`
else
if test -n "$with_curl"; then
- curl_flags="-I$with_curl/include"
- curl_libs="-L$with_curl/lib -lcurl"
+ curl_flags=""
+ curl_libs="-lcurl"
else
# Default compiler paths.
#

8
meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb
View File

@ -9,7 +9,9 @@ SECTION = "libs"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2"
SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2 \
file://0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch \
"
SRC_URI[sha256sum] = "1db4028c9b7f1f778efbf4a9462d65e13f9938f2c22f9e9994e12c49ba97e252"
inherit autotools
@ -18,10 +20,6 @@ PACKAGECONFIG ??= "curl icu"
PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl"
PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu"
do_install:prepend () {
sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc
}
PACKAGES = "libxerces-c \
libxerces-c-dev \
xerces-c-samples \