From 16176407045a88be4ceb7128343a7ef48874238b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Tue, 7 Feb 2017 20:38:03 +0300 Subject: [PATCH] fix build emul32bit --- multimedia/graphics/jasper/actions.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/multimedia/graphics/jasper/actions.py b/multimedia/graphics/jasper/actions.py index 8b50867857..a3b5be590a 100644 --- a/multimedia/graphics/jasper/actions.py +++ b/multimedia/graphics/jasper/actions.py @@ -14,11 +14,17 @@ def setup(): shelltools.makedirs("build") shelltools.cd("build") - cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ + if get.buildTYPE() != "emul32": + options = "-DCMAKE_INSTALL_PREFIX=/usr" + + if get.buildTYPE() == "emul32": + options = "-DCMAKE_INSTALL_PREFIX=/emul32/lib32" + + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + %s \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ -DALLOW_IN_SOURCE_BUILD=ON \ - -DCMAKE_SKIP_INSTALL_RPATH=YES", sourceDir=".." ) + -DCMAKE_SKIP_INSTALL_RPATH=YES" % options, sourceDir=".." ) def build(): shelltools.cd("build") @@ -29,6 +35,10 @@ def install(): shelltools.cd("build") cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": + pisitools.domove("/emul32/lib32/", "/usr/") + pisitools.removeDir("/emul32") shelltools.cd("..") pisitools.dodoc("LICENSE", "README")