{vis}[mixed] OpenCV 3.1.0 fix ippicv source download and library install (REVIEW)#4126
{vis}[mixed] OpenCV 3.1.0 fix ippicv source download and library install (REVIEW)#4126boegel merged 2 commits intoeasybuilders:developfrom
Conversation
| ] | ||
|
|
||
| #The destination directory is "linux-<MD5>" see 3rdparty/ippicv/downloader.cmake | ||
| preconfigopts = 'mkdir -p {0} && cp -a ../*.tgz {0}. &&'.format("3rdparty/ippicv/downloads/linux-808b791a6eac9ed78d32a7666804320e/") |
There was a problem hiding this comment.
@hajgato line is too long, how about this:
ippicv_dir = '3rdparty/ippicv/downloads/linux-808b791a6eac9ed78d32a7666804320e/'
preconfigopts = "mkdir -p {0} && cp -a ../*.tgz {0} && ".format(ippicv_dir)I'm not a big fan of using .format in easyconfigs, but admittedly this is not better:
preconfigopts = "mkdir -p %s && cp -a ../*.tgz %s && " % (ippicv_dir, ippicv_dir)That does follow the easyconfigs style we usually go with though...
|
|
||
| sources = [ | ||
| '%(version)s.zip', | ||
| ('ippicv_linux_20151201.tgz', 'cp %s %(builddir)s'), |
There was a problem hiding this comment.
@hajgato does this actually work? Don't you need to use cp %s %%(builddir)s or cp %%s %(builddir)s (not sure which template is resolved first)?
There was a problem hiding this comment.
@boegel Actually it worked for me. I have checked in the builddir, and the file was there.
There was a problem hiding this comment.
hmm, that's pretty strange actually...
>>> "%s %(builddir)s" % {'builddir': 'test'}
"{'builddir': 'test'} test"
There was a problem hiding this comment.
ah, no, it makes sense, the resolve_template method is smart enough to translate %s into %%s by itself before resolving the named templates, so fine as is
| configopts += '-DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSE3=ON ' | ||
| configopts += '-DWITH_CUDA=OFF ' | ||
|
|
||
| postinstallcmds = ["cp 3rdparty/ippicv/unpack/ippicv_lnx/lib/intel64/libippicv.* %(installdir)s/lib"] |
There was a problem hiding this comment.
this should be reflected in sanity_check_paths? (also, remove the double space ;-))
|
Test report by @boegel |
|
lgtm |
|
Test report by @boegel |
|
Going in, thanks @hajgato! |
No description provided.