From 920ea531f1e8bcbd2ae33c22b086f6d5af12bfa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 5 Jul 2020 17:04:05 +0700 Subject: [PATCH] cdrtools: cross-compile - fix detection of ext2 - Use hardening flags in install steps, too. --- srcpkgs/cdrtools/template | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cdrtools/template b/srcpkgs/cdrtools/template index 30f24bfe74d..65888a46906 100644 --- a/srcpkgs/cdrtools/template +++ b/srcpkgs/cdrtools/template @@ -1,20 +1,31 @@ # Template file for 'cdrtools' pkgname=cdrtools version=3.02a09 -revision=1 +revision=2 wrksrc="${pkgname}-${version%a*}" -nocross=yes +build_helper=qemu hostmakedepends="smake" -makedepends="acl-devel libcap-devel" +makedepends="acl-devel libcap-devel e2fsprogs-devel" conf_files="/etc/default/rscsi /etc/default/cdrecord" short_desc="Highly portable CD/DVD/BluRay command line recording software" -homepage="http://cdrtools.sourceforge.net/private/cdrecord.html" -license="CDDL-1.0" maintainer="Orphaned " +license="CDDL-1.0" +homepage="http://cdrtools.sourceforge.net/private/cdrecord.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=aa28438f458ef3f314b79f2029db27679dae1d5ffe1569b6de57742511915e81 +if [ "$CROSS_BUILD" ]; then + export CONFIG_RMTCALL="qemu-$XBPS_TARGET_QEMU_MACHINE-static" + export CONFIG_RMTHOST=non-exist +fi + do_build() { + mkdir -p xinclude/linux + for _file in "$XBPS_CROSS_BASE"/usr/include/ext2fs/*; do + ln -sf "$_file" xinclude/linux + done + CPPFLAGS+=" -I$wrksrc/xinclude" + CFLAGS+=" -I$wrksrc/xinclude" sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux @@ -22,7 +33,13 @@ do_build() { smake CC="$CC" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" RUNPATH= LDPATH= NOWARN=1 } do_install() { - smake INS_BASE=/usr MANDIR=/man DESTDIR=${DESTDIR} install + CPPFLAGS+=" -I$wrksrc/xinclude" + CFLAGS+=" -I$wrksrc/xinclude" + smake \ + CC="$CC" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" \ + RUNPATH= LDPATH= NOWARN=1 \ + INS_BASE=/usr MANDIR=/man DESTDIR=${DESTDIR} \ + install # Remove useless stuff rm -rf ${DESTDIR}/usr/include rm -rf ${DESTDIR}/usr/lib/lib* ${DESTDIR}/usr/lib/profiled