zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frontier-client: adapt pacparser_setmyip function to new pacparser release (#29936)

Browse Source
This commit is contained in:
haralmha 2022-05-16 10:41:21 +02:00 committed by GitHub
parent 35ed7973e2
commit 77fb651e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
var/spack/repos/builtin/packages/frontier-client/package.py
View File

@ -26,6 +26,26 @@ class FrontierClient(MakefilePackage):
patch('frontier-client.patch', level=0) patch('frontier-client.patch', level=0)
# pacparser changed the function return type from void to
# int from v1.3.9, whereas frontier-client has not tagged
# any new versions in a while. Therefore, the patch below
# serves as a (temporary) fix. See
# https://github.com/spack/spack/pull/29936
@when('^pacparser@1.3.9:')
def patch(self):
filter_file('static void (*pp_setmyip)(const char *);',
'static int (*pp_setmyip)(const char *);',
'client/pacparser-dlopen.c', string=True)
filter_file('void pacparser_setmyip(const char *ip)',
'int pacparser_setmyip(const char *ip)',
'client/pacparser-dlopen.c', string=True)
filter_file(r' if\(\!pp_dlhandle\)\n return;',
r' if\(\!pp_dlhandle\)\n return 0;',
'client/pacparser-dlopen.c')
filter_file(' (*pp_setmyip)(ip);',
' return (*pp_setmyip)(ip);',
'client/pacparser-dlopen.c', string=True)
def edit(self, spec, prefix): def edit(self, spec, prefix):
makefile = FileFilter('client/Makefile') makefile = FileFilter('client/Makefile')
makefile.filter('EXPAT_DIR}/lib', 'EXPAT_DIR}/lib64') makefile.filter('EXPAT_DIR}/lib', 'EXPAT_DIR}/lib64')