From ab7fcee9a2306f3d59cb24e23af50c541726a79b Mon Sep 17 00:00:00 2001 From: Username404 Date: Wed, 18 Aug 2021 13:38:58 +0200 Subject: [PATCH] Set CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS in the Jenkinsfile to avoid errors caused by dpkg --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb91f06..f2181a5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ def buildTarget(String path, String rpmArch, String debArch, boolean isPackageArchDeb = true) { String packageArch = isPackageArchDeb ? debArch : rpmArch; cmakeBuild buildDir: "cmake-build-${packageArch}", buildType: 'release', cleanBuild: true, installation: 'Main', - cmakeArgs: "-DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=/usr/bin/${path}-ld.gold -DCMAKE_AR=/usr/bin/${path}-ar -DCPACK_RPM_PACKAGE_ARCHITECTURE=${rpmArch} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=${debArch} -DCXX_TARGET=${packageArch}" + cmakeArgs: "-DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=/usr/bin/${path}-ld.gold -DCMAKE_AR=/usr/bin/${path}-ar -DCPACK_RPM_PACKAGE_ARCHITECTURE=${rpmArch} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=${debArch} -DCXX_TARGET=${packageArch} -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS=/usr/${path}/lib/" cmake arguments: "--build ./cmake-build-${packageArch} --target ybcon", installation: 'Main' sh "/usr/bin/${path}-strip ./cmake-build-${packageArch}/ybcon" cpack installation: 'Main', workingDir: "cmake-build-${packageArch}"