← Back to branch summary

~jocave/snapcraft/plainbox-provider-plugin

« back to all changes in this revision

Viewing changes to snapcraft/yaml.py

  • Committer: Michael Terry
  • Date: 2015-08-06 14:59:07 UTC
  • mfrom: (129 snapcraft)
  • mto: This revision was merged to the branch mainline in revision 132.
  • Revision ID: michael.terry@canonical.com-20150806145907-wzkkzm3mitiewa03
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
snapcraft/yaml.py
113
113
 
114
114
    def runtime_env(self, root):
115
115
        env = []
116
 
        env.append("PATH=\"%s/bin:%s/usr/bin:$PATH\"" % (root, root))
117
 
        env.append("LD_LIBRARY_PATH=\"%s/lib:%s/usr/lib:$LD_LIBRARY_PATH\"" % (root, root))
 
116
        env.append('PATH="{0}/bin:{0}/usr/bin:$PATH"'.format(root))
 
117
        env.append('LD_LIBRARY_PATH="{0}/lib:{0}/usr/lib:{0}/lib/{1}:{0}/usr/lib/{1}:$LD_LIBRARY_PATH"'.format(root, snapcraft.common.get_arch_triplet()))
118
118
        return env
119
119
 
120
120
    def build_env(self, root):
121
121
        env = []
122
 
        env.append("CFLAGS=\"-I%s/include $CFLAGS\"" % root)
123
 
        env.append("LDFLAGS=\"-L%s/lib -L%s/usr/lib $LDFLAGS\"" % (root, root))
 
122
        env.append('CFLAGS="-I{0}/include -I{0}/usr/include -I{0}/include/{1} -I{0}/usr/include/{1} $CFLAGS"'.format(root, snapcraft.common.get_arch_triplet()))
 
123
        env.append('LDFLAGS="-L{0}/lib -L{0}/usr/lib -L{0}/lib/{1} -L{0}/usr/lib/{1} $LDFLAGS"'.format(root, snapcraft.common.get_arch_triplet()))
124
124
        return env
125
125
 
126
126
    def build_env_for_part(self, part):