freediameter: Fix buildpaths QA error

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2024-08-14 19:51:28 -07:00
parent b35cd00fe1
commit 3267d1cf30
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 44 additions and 4 deletions

View File

@ -0,0 +1,39 @@
From fa6227d92725af5ae17b8435c0d50d92ff7a575c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 14 Aug 2024 19:32:25 -0700
Subject: [PATCH] bison/flex: Add flags for carrying user specified parameters
This helps in passing cmdline to flex and bison e.g. to remove lines
from generated output to avoid absolute paths
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
cmake/Modules/CMakeUserUseBison.cmake | 1 +
cmake/Modules/CMakeUserUseFlex.cmake | 1 +
2 files changed, 2 insertions(+)
diff --git a/cmake/Modules/CMakeUserUseBison.cmake b/cmake/Modules/CMakeUserUseBison.cmake
index 9257545..b61bd0e 100644
--- a/cmake/Modules/CMakeUserUseBison.cmake
+++ b/cmake/Modules/CMakeUserUseBison.cmake
@@ -52,6 +52,7 @@ IF(BISON_EXECUTABLE)
OUTPUT "${OUTFILE}" "${HEADER}"
COMMAND "${BISON_EXECUTABLE}"
ARGS "--name-prefix=${PREFIX}"
+ "${BISON_TARGET_ARG_COMPILE_FLAGS}"
"--defines"
"--output-file=${OUTFILE}"
"${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
diff --git a/cmake/Modules/CMakeUserUseFlex.cmake b/cmake/Modules/CMakeUserUseFlex.cmake
index 7d0394f..1221dca 100644
--- a/cmake/Modules/CMakeUserUseFlex.cmake
+++ b/cmake/Modules/CMakeUserUseFlex.cmake
@@ -39,6 +39,7 @@ IF(FLEX_EXECUTABLE)
OUTPUT "${OUTFILE}"
COMMAND "${FLEX_EXECUTABLE}"
ARGS "-P${PREFIX}"
+ "${FLEX_TARGET_ARG_COMPILE_FLAGS}"
"-o${OUTFILE}"
"${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")

View File

@ -7,7 +7,7 @@ Accounting needs."
HOMEPAGE = "http://www.freediameter.net"
DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native"
DEPENDS = "flex-native bison-native cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@ -23,6 +23,7 @@ SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=mast
file://freeDiameter.conf \
file://install_test.patch \
file://0001-tests-use-EXTENSIONS_DIR.patch \
file://0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch \
"
S = "${WORKDIR}/git"
@ -49,6 +50,8 @@ EXTRA_OECMAKE = " \
-DEXTENSIONS_DIR:PATH=${libdir}/${fd_pkgname} \
-DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \
-DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \
"
# INSTALL_LIBRARY_SUFFIX is relative to CMAKE_INSTALL_PREFIX
# specify it on cmd line will fix the SET bug in CMakeList.txt
@ -107,15 +110,13 @@ EOF
# create self cert
openssl req -x509 -config ${STAGING_DIR_NATIVE}/etc/ssl/openssl.cnf -newkey rsa:4096 -sha256 -nodes -out ${D}${sysconfdir}/freeDiameter/${FD_PEM} -keyout ${D}${sysconfdir}/freeDiameter/${FD_KEY} -days 3650 -subj '/CN=${FD_HOSTNAME}.${FD_REALM}'
openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024
find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${UNPACKDIR}##g' {} \;
}
do_install_ptest() {
mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/
rmdir ${D}${PTEST_PATH}-tests
install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/
sed -i -e 's#${UNPACKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake
sed -i -e 's#${WORKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake
sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake
}