You've already forked linux-packaging-mono
Imported Upstream version 6.0.0.316
Former-commit-id: 08a23473ec9c2cd4b2662fe9c269eb7c7319b266
This commit is contained in:
parent
c84f4746af
commit
e9207cf623
4
external/bockbuild/bb
vendored
4
external/bockbuild/bb
vendored
@@ -194,8 +194,6 @@ class Bockbuild:
|
||||
self.artifact_root, '%s-%s' % (package.name, arch))
|
||||
package.buildstring_file = package.build_artifact + '.buildstring'
|
||||
package.log = os.path.join(self.logs, package.name + '.log')
|
||||
if os.path.exists(package.log):
|
||||
delete(package.log)
|
||||
|
||||
package.source_dir_name = expand_macros(package.source_dir_name, package)
|
||||
workspace_path = os.path.join(self.build_root, package.source_dir_name)
|
||||
@@ -226,6 +224,8 @@ class Bockbuild:
|
||||
package.deploy_requests.append (stage)
|
||||
|
||||
for package in packages.values():
|
||||
if os.path.exists(package.log):
|
||||
delete(package.log)
|
||||
package.start_build(arch, dest, stage)
|
||||
# make artifact in scratch
|
||||
# delete artifact + buildstring
|
||||
|
4
external/bockbuild/bockbuild.py
vendored
4
external/bockbuild/bockbuild.py
vendored
@@ -194,8 +194,6 @@ class Bockbuild:
|
||||
self.artifact_root, '%s-%s' % (package.name, arch))
|
||||
package.buildstring_file = package.build_artifact + '.buildstring'
|
||||
package.log = os.path.join(self.logs, package.name + '.log')
|
||||
if os.path.exists(package.log):
|
||||
delete(package.log)
|
||||
|
||||
package.source_dir_name = expand_macros(package.source_dir_name, package)
|
||||
workspace_path = os.path.join(self.build_root, package.source_dir_name)
|
||||
@@ -226,6 +224,8 @@ class Bockbuild:
|
||||
package.deploy_requests.append (stage)
|
||||
|
||||
for package in packages.values():
|
||||
if os.path.exists(package.log):
|
||||
delete(package.log)
|
||||
package.start_build(arch, dest, stage)
|
||||
# make artifact in scratch
|
||||
# delete artifact + buildstring
|
||||
|
@@ -139,12 +139,12 @@ class DarwinProfile (UnixProfile):
|
||||
package.local_ld_flags = ['-arch i386', '-m32']
|
||||
package.local_gcc_flags = ['-arch i386', '-m32']
|
||||
package.local_configure_flags = [
|
||||
'--build=i386-apple-darwin13.0.0', '--disable-dependency-tracking']
|
||||
'--build=i386-apple-darwin13.0.0', '--host=i386-apple-darwin13.0.0', '--disable-dependency-tracking']
|
||||
elif arch == 'darwin-64':
|
||||
package.local_ld_flags = ['-arch x86_64 -m64']
|
||||
package.local_gcc_flags = ['-arch x86_64 -m64']
|
||||
package.local_configure_flags = [
|
||||
'--build=x86_64-apple-darwin13.0.0', '--disable-dependency-tracking']
|
||||
'--build=x86_64-apple-darwin13.0.0', '--host=x86_64-apple-darwin13.0.0', '--disable-dependency-tracking']
|
||||
else:
|
||||
error('Unknown arch %s' % arch)
|
||||
|
||||
|
Reference in New Issue
Block a user