From a8eacbc521ce2e95a96ff62133932699f459f6cd Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 7 Jan 2015 06:06:28 +0000 Subject: [PATCH] openjpeg-2.1.0.recipe edited online with Bitbucket Added x86_gcc2 since it will build just fine with gcc2. Moved Patches to be just above BUILD --- media-libs/openjpeg/openjpeg-2.1.0.recipe | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/media-libs/openjpeg/openjpeg-2.1.0.recipe b/media-libs/openjpeg/openjpeg-2.1.0.recipe index a8eb98d21..4129b11a3 100644 --- a/media-libs/openjpeg/openjpeg-2.1.0.recipe +++ b/media-libs/openjpeg/openjpeg-2.1.0.recipe @@ -20,17 +20,7 @@ HOMEPAGE="http://www.openjpeg.org/" SRC_URI="http://sourceforge.net/projects/openjpeg.mirror/files/$portVersion/openjpeg-$portVersion.tar.gz" CHECKSUM_SHA256="1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03" REVISION="2" -ARCHITECTURES="x86 x86_64" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - # x86_gcc2 is fine as primary target architecture as long as we're building - # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES x86_gcc2" -else - ARCHITECTURES="$ARCHITECTURES !x86_gcc2" -fi -SECONDARY_ARCHITECTURES="x86" - -PATCHES="openjpeg-2.1.0.patchset" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" openjpeg$secondaryArchSuffix = $portVersion @@ -70,6 +60,8 @@ REQUIRES_devel=" openjpeg$secondaryArchSuffix == $portVersion " +PATCHES="openjpeg-2.1.0.patchset" + BUILD() { mkdir -p build