From df71f51125a0fc0b6b26f90e9fc76c3d354a3cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 18 Dec 2017 06:52:27 +0100 Subject: [PATCH] rpm: fix cross --- srcpkgs/rpm/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index 322ca7d529..0169c69db1 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -15,17 +15,17 @@ homepage="http://rpm.org" distfiles="http://ftp.rpm.org/releases/rpm-${version%.*.*}.x/rpm-${version}.tar.bz2" checksum=2f3e2c07c354d16f2305ddd93ed030c8403d59b272f2fb6722445b091ff14194 conflicts="rpmextract>=0" # Both provide rpm2cpio -nocross="too buggy header detection and incompatible with musl fixes" -_EXTRA_INCLUDES=" -I/usr/include/nss -I/usr/include/nspr" -CFLAGS=" ${_EXTRA_INCLUDES}" +CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" +CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss" +CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr" case "$XBPS_TARGET_MACHINE" in # Musl requires gettext to be included and it's cflag added otherwise # it fails with _nl_msg_cat_cntr undefined reference error *-musl*) - hostmakedepends+=" gettext-devel" - CFLAGS+=" -lintl" + makedepends+=" gettext-devel" + LDFLAGS+=" -lintl" ;; esac