From 9da6bec63d66769ccba7204bcf79492f1faee1bb Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sat, 11 Nov 2017 23:08:53 +0100 Subject: [PATCH] passwordsafe: fix cross compilation with wxWidgets --- srcpkgs/passwordsafe/template | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index 8b47e7b65a8..185cd99fa95 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -1,12 +1,11 @@ -# Template file for 'passwordwsafe' +# Template file for 'passwordsafe' pkgname=passwordsafe version="1.03BETA" revision=2 wrksrc="pwsafe-${version}" build_style=cmake -configure_args="-D wxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0" # build process uses perl to generate core_st.cpp and zip to generate help files -hostmakedepends="perl wxWidgets-devel zip pkg-config gettext" +hostmakedepends="perl zip pkg-config gettext" makedepends="wxWidgets-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel libykpers-devel gtest-devel qrencode-devel" short_desc="Simple & Secure Password Management" @@ -15,8 +14,14 @@ license="Artistic-2.0" homepage="http://pwsafe.org" distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz>pwsafe-${version}.tar.gz" checksum=36d64d748a63825cb17e247628f6a378f131d952d4c1715cc6304e4d07b3e0ed -# wxWidgets is nocross -nocross=yes + +pre_configure() { + # cmake doesn’t find/use the wx-config wrapper + # ykpers-1 includes are hardcoded, add cross base + sed -i -e "1i\set(wxWidgets_CONFIG_OPTIONS --prefix=${XBPS_CROSS_BASE}/usr)" \ + -e "s|-I\(/usr/include/ykpers-1\)|-I${XBPS_CROSS_BASE}\1|" \ + CMakeLists.txt +} do_install() { # use 'passwordsafe' in filenames as much as possible.