diff mbox series

[kirkstone,1/2] sip3: Add sipconfig.py

Message ID 20231202030950.3357721-2-rob.woolley@windriver.com
State New
Headers show
Series Add sipconfig.py support to sip3 | expand

Commit Message

Rob Woolley Dec. 2, 2023, 3:09 a.m. UTC 
Add the destdir option to ensure that sipconfig.py gets installed to the
site-packages directory and included in python3-sip3.

Remove references to the build paths from sipconfig.py as part of the
install stage.  One may then prepend STAGING_DIR_NATIVE to sip_bin and
STAGING_DIR_TARGET to *_dir in any recipe that uses sipconfig.py.

Signed-off-by: Rob Woolley <rob.woolley@windriver.com>
---
 meta-oe/recipes-devtools/sip/sip3_4.19.23.bb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb b/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
index d6335585e..064ab0a0c 100644
--- a/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
+++ b/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
@@ -29,11 +29,28 @@  do_configure:prepend() {
     echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
     echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg
     echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
-    ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${CONFIGURE_SYSROOT} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
+    ${PYTHON} configure.py --configuration sip.cfg --destdir /${D}${libdir}/${PYTHON_DIR}/site-packages/ --sip-module PyQt5.sip --sysroot ${CONFIGURE_SYSROOT} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
 }
 
 do_install() {
     oe_runmake install
+
+    sed -i \
+         -e "s@[^ ]*-fdebug-prefix-map=[^ ']*@@g" \
+         -e "s@[^ ]*-fmacro-prefix-map=[^ ']*@@g" \
+         -e "s@[^ ]*-ffile-prefix-map=[^ ']*@@g" \
+         ${D}${libdir}/${PYTHON_DIR}/site-packages/sipconfig.py
+
+    # Remove the destination directory
+    sed -i -e "s@${D}/@@g" ${D}${libdir}/${PYTHON_DIR}/site-packages/sipconfig.py
+
+    if [ -n "${STAGING_DIR_NATIVE}" ]; then
+        sed -i -e "s@${STAGING_DIR_NATIVE}@@g" ${D}${libdir}/${PYTHON_DIR}/site-packages/sipconfig.py
+    fi
+
+    if [ -n "${STAGING_DIR_TARGET}" ]; then
+       sed -i -e "s@${STAGING_DIR_TARGET}@@g" ${D}${libdir}/${PYTHON_DIR}/site-packages/sipconfig.py
+    fi
 }
 
 FILES:python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/"