From a3739233124926cc4ec311043aca3eb7b660f9f8 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 1 Apr 2017 14:36:07 +0200 Subject: [PATCH] cdrtools: allow secondary arch. Not so much for the app itself, but for the devel stuff in the devel package. --- app-cdr/cdrtools/cdrtools-3.02~a07.recipe | 75 ++++++++++++----------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/app-cdr/cdrtools/cdrtools-3.02~a07.recipe b/app-cdr/cdrtools/cdrtools-3.02~a07.recipe index a1f09b75e..c631470c7 100644 --- a/app-cdr/cdrtools/cdrtools-3.02~a07.recipe +++ b/app-cdr/cdrtools/cdrtools-3.02~a07.recipe @@ -30,6 +30,7 @@ PATCHES=" " ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc" +SECONDARY_ARCHITECTURES="x86" GLOBAL_WRITABLE_FILES=" settings/cdrecord keep-old @@ -37,57 +38,57 @@ GLOBAL_WRITABLE_FILES=" " PROVIDES=" - cdrtools = $portVersion compat >= 3 - cmd:devdump = $portVersion compat >= 3 - cmd:rscsi = $portVersion compat >= 3 - cmd:scgcheck = $portVersion compat >= 3 - cmd:mkisofs = $portVersion compat >= 3 - cmd:btcflash = $portVersion compat >= 3 - cmd:scgskeleton = $portVersion compat >= 3 - cmd:isovfy = $portVersion compat >= 3 - cmd:readcd = $portVersion compat >= 3 - cmd:isodebug = $portVersion compat >= 3 - cmd:cdda2mp3 = $portVersion compat >= 3 - cmd:cdda2ogg = $portVersion compat >= 3 - cmd:cdda2wav = $portVersion compat >= 3 - cmd:mkhybrid = $portVersion compat >= 3 - cmd:cdrecord = $portVersion compat >= 3 - cmd:isodump = $portVersion compat >= 3 - cmd:isoinfo = $portVersion compat >= 3 + cdrtools$secondaryArchSuffix = $portVersion compat >= 3 + cmd:devdump$secondaryArchSuffix = $portVersion compat >= 3 + cmd:rscsi$secondaryArchSuffix = $portVersion compat >= 3 + cmd:scgcheck$secondaryArchSuffix = $portVersion compat >= 3 + cmd:mkisofs$secondaryArchSuffix = $portVersion compat >= 3 + cmd:btcflash$secondaryArchSuffix = $portVersion compat >= 3 + cmd:scgskeleton$secondaryArchSuffix = $portVersion compat >= 3 + cmd:isovfy$secondaryArchSuffix = $portVersion compat >= 3 + cmd:readcd$secondaryArchSuffix = $portVersion compat >= 3 + cmd:isodebug$secondaryArchSuffix = $portVersion compat >= 3 + cmd:cdda2mp3$secondaryArchSuffix = $portVersion compat >= 3 + cmd:cdda2ogg$secondaryArchSuffix = $portVersion compat >= 3 + cmd:cdda2wav$secondaryArchSuffix = $portVersion compat >= 3 + cmd:mkhybrid$secondaryArchSuffix = $portVersion compat >= 3 + cmd:cdrecord$secondaryArchSuffix = $portVersion compat >= 3 + cmd:isodump$secondaryArchSuffix = $portVersion compat >= 3 + cmd:isoinfo$secondaryArchSuffix = $portVersion compat >= 3 " REQUIRES=" - haiku + haiku$secondaryArchSuffix " PROVIDES_devel=" - cdrtools_devel = $portVersion - devel:libcdrdeflt = $portVersion compat >= 3 - devel:libedc_ecc = $portVersion compat >= 3 - devel:libedc_ecc_dec = $portVersion compat >= 3 - devel:libdeflt = $portVersion compat >= 3 - devel:libfile = $portVersion compat >= 3 - devel:libfind = $portVersion compat >= 3 - devel:libhfs = $portVersion compat >= 3 - devel:libmdigest = $portVersion compat >= 3 - devel:libparanoia = $portVersion compat >= 3 - devel:librscg = $portVersion compat >= 3 - devel:libscg = $portVersion compat >= 3 - devel:libsiconv = $portVersion compat >= 3 - devel:libscgcmd = $portVersion compat >= 3 - devel:libschily = $portVersion compat >= 3 + cdrtools${secondaryArchSuffix}_devel = $portVersion + devel:libcdrdeflt$secondaryArchSuffix = $portVersion compat >= 3 + devel:libedc_ecc$secondaryArchSuffix = $portVersion compat >= 3 + devel:libedc_ecc_dec$secondaryArchSuffix = $portVersion compat >= 3 + devel:libdeflt$secondaryArchSuffix = $portVersion compat >= 3 + devel:libfile$secondaryArchSuffix = $portVersion compat >= 3 + devel:libfind$secondaryArchSuffix = $portVersion compat >= 3 + devel:libhfs$secondaryArchSuffix = $portVersion compat >= 3 + devel:libmdigest$secondaryArchSuffix = $portVersion compat >= 3 + devel:libparanoia$secondaryArchSuffix = $portVersion compat >= 3 + devel:librscg$secondaryArchSuffix = $portVersion compat >= 3 + devel:libscg$secondaryArchSuffix = $portVersion compat >= 3 + devel:libsiconv$secondaryArchSuffix = $portVersion compat >= 3 + devel:libscgcmd$secondaryArchSuffix = $portVersion compat >= 3 + devel:libschily$secondaryArchSuffix = $portVersion compat >= 3 " REQUIRES_devel=" - cdrtools == $portVersion base + cdrtools$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" - haiku_devel + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:find - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:grep - cmd:ld + cmd:ld$secondaryArchSuffix cmd:make cmd:sed "