From 0b8fb0fbbd39fe0c61b8da2db28453c7a1beec88 Mon Sep 17 00:00:00 2001 From: miqlas Date: Fri, 1 Sep 2017 12:51:29 +0200 Subject: [PATCH] OpenCV: Do not add _x86 to the binaries --- media-libs/opencv/opencv-3.3.0.recipe | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/media-libs/opencv/opencv-3.3.0.recipe b/media-libs/opencv/opencv-3.3.0.recipe index ae81bc4ab..a7ecfb222 100644 --- a/media-libs/opencv/opencv-3.3.0.recipe +++ b/media-libs/opencv/opencv-3.3.0.recipe @@ -19,14 +19,20 @@ PATCHES="opencv-$portVersion.patchset" ARCHITECTURES="?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" +# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= +fi + PROVIDES=" opencv$secondaryArchSuffix = $portVersion compat >= 3 - cmd:opencv_annotation$secondaryArchSuffix= $portVersion - cmd:opencv_createsamples$secondaryArchSuffix= $portVersion - cmd:opencv_interactive_calibration$secondaryArchSuffix= $portVersion - cmd:opencv_traincascade$secondaryArchSuffix= $portVersion - cmd:opencv_version$secondaryArchSuffix= $portVersion - cmd:opencv_visualisation$secondaryArchSuffix= $portVersion + cmd:opencv_annotation$commandSuffix= $portVersion + cmd:opencv_createsamples$commandSuffix= $portVersion + cmd:opencv_interactive_calibration$commandSuffix= $portVersion + cmd:opencv_traincascade$commandSuffix= $portVersion + cmd:opencv_version$commandSuffix= $portVersion + cmd:opencv_visualisation$commandSuffix= $portVersion lib:libopencv_calib3d$secondaryArchSuffix = 3.3.0 compat >= 3 lib:libopencv_core$secondaryArchSuffix = 3.3.0 compat >= 3 lib:libopencv_dnn$secondaryArchSuffix = 3.3.0 compat >= 3