summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-05-24 10:53:30 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-24 10:53:30 +0100
commit337c1649ea0ca984b750c31cc3888a3a8201012b (patch)
tree1dbecb7f59a74d3e9d46bb80f3cde49d0e169e12 /cscript
parentd9773e457718204a376a21423920819fd71b3d1f (diff)
Yet more Centos 5 hacks.
Diffstat (limited to 'cscript')
-rw-r--r--cscript7
1 files changed, 5 insertions, 2 deletions
diff --git a/cscript b/cscript
index 60c825780..04929e2ff 100644
--- a/cscript
+++ b/cscript
@@ -205,7 +205,7 @@ def make_spec(filename, version, target):
print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig' % (target.directory, target.directory), file=f)
if target.distro == 'centos' and target.version == '5':
- prefix = './usr'
+ prefix = 'BUILDROOT/usr'
else:
prefix = '%%{buildroot}/usr'
@@ -323,7 +323,10 @@ def package_rpm(target, cpu, version):
)
make_spec('build/platform/linux/dcpomatic2.spec', version, target)
- target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir)
+ cmd = 'rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir
+ if target.distro == 'centos' and target.version == '5':
+ cmd += ' --buildroot %s/BUILD/%s/BUILDROOT' % (topdir, version)
+ target.command(cmd)
rpms = []
if cpu == "amd64":