From cfd040836ad117972ac455bd81e1a858b4e6c206 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sun, 12 Jan 2020 15:24:20 -0600 Subject: [PATCH] xbindkeys: unmark nocross Signed-off-by: Nathan Owens --- srcpkgs/xbindkeys/patches/cross.patch | 15 +++++++++++++++ srcpkgs/xbindkeys/template | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xbindkeys/patches/cross.patch diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch new file mode 100644 index 00000000000..eb5086f5875 --- /dev/null +++ b/srcpkgs/xbindkeys/patches/cross.patch @@ -0,0 +1,15 @@ +diff --git Makefile.in Makefile.in +index 7bb5cba..e557452 100644 +--- Makefile.in ++++ Makefile.in +@@ -205,8 +205,8 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall + @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall +-@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ +-@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@ ++@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.0 -lgc ++@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.0 -lgc + xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \ + keys.h keys.c \ + options.c options.h \ diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template index 4d61017e4c6..806571204d5 100644 --- a/srcpkgs/xbindkeys/template +++ b/srcpkgs/xbindkeys/template @@ -11,4 +11,9 @@ license="GPL-2.0-or-later" homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html" distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz" checksum=6c0d18be19fc19ab9b4595edf3a23c0a6946c8a5eb5c1bc395471c8f9a710d18 -nocross="configure: error: guile required but not found" + +if [ "$CROSS_BUILD" ]; then + CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/guile/2.0" + configure_args="ac_cv_path_GUILE=${XBPS_CROSS_BASE}/usr/lib + ac_cv_path_GUILE_CONFIG=${XBPS_CROSS_BASE}/usr/bin/guile-config" +fi