projects
/
cdist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34b2ba6
)
Fix LocalTarget to work better (mostly making it work like a normal Linux target).
author
Carl Hetherington
<cth@carlh.net>
Fri, 29 Mar 2024 21:18:55 +0000
(22:18 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 29 Mar 2024 21:18:55 +0000
(22:18 +0100)
cdist
patch
|
blob
|
history
diff --git
a/cdist
b/cdist
index 9c1d1bd3d147583798766eb204c50bb5a685f714..dc64605008ee0bc3b675622d021ce8d13dc21ec2 100755
(executable)
--- a/
cdist
+++ b/
cdist
@@
-915,12
+915,17
@@
class SourceTarget(Target):
class LocalTarget(Target):
"""Build on the local machine with its environment"""
class LocalTarget(Target):
"""Build on the local machine with its environment"""
- def __init__(self, work):
- super(LocalTarget, self).__init__('l
ocal', work
)
+ def __init__(self, work
, dependencies_only=False
):
+ super(LocalTarget, self).__init__('l
inux', work, dependencies_only=dependencies_only
)
# Hack around ffmpeg.git which sees that the target isn't windows/osx and then assumes
# distro will be there.
self.distro = None
# Hack around ffmpeg.git which sees that the target isn't windows/osx and then assumes
# distro will be there.
self.distro = None
+ self.detail = None
+ self.bits = 64
self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/bin/pkgconfig' % (self.directory, self.directory))
self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/bin/pkgconfig' % (self.directory, self.directory))
+ self.append_with_colon('LD_LIBRARY_PATH', '%s/lib' % self.directory)
+ self.set('CXXFLAGS', '-I%s/include' % self.directory)
+ self.set('LINKFLAGS', '-L%s/lib' % self.directory)
def command(self, c):
log_normal('host -> %s' % c)
def command(self, c):
log_normal('host -> %s' % c)