diff --git a/pisi/actionsapi/autotools.py b/pisi/actionsapi/autotools.py index 575800a7..ab9cb473 100644 --- a/pisi/actionsapi/autotools.py +++ b/pisi/actionsapi/autotools.py @@ -75,10 +75,12 @@ def configure(parameters = ''): --sysconfdir=/%s \ --localstatedir=/%s \ --libexecdir=/%s \ - %s' % (prefix, \ - get.HOST(), get.manDIR(), \ - get.infoDIR(), get.dataDIR(), \ - get.confDIR(), get.localstateDIR(), get.libexecDIR(), parameters) + %s%s' % (prefix, \ + get.HOST(), get.manDIR(), \ + get.infoDIR(), get.dataDIR(), \ + get.confDIR(), get.localstateDIR(), get.libexecDIR(), + "--libdir=/usr/lib32 " if get.buildTYPE() == "emul32" else "", + parameters) if get.buildTYPE() == "emul32": args += " --libdir=/usr/lib32" diff --git a/pisi/operations/build.py b/pisi/operations/build.py index 8e4ab03b..51c5f8af 100644 --- a/pisi/operations/build.py +++ b/pisi/operations/build.py @@ -409,6 +409,7 @@ class Builder: env["CXX"] = "%s -m32" % os.getenv("CXX") env["CFLAGS"] = os.getenv("CFLAGS").replace("-fPIC", "") env["CXXFLAGS"] = os.getenv("CXXFLAGS").replace("-fPIC", "") + env["PKG_CONFIG_PATH"] = "/usr/lib32/pkgconfig" os.environ.update(env) # First check icecream, if not found use ccache