timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improve Python packaging

Browse source
This commit is contained in:
Hubert Chathi 2023-04-25 18:47:14 -04:00
parent 8f4b81b512
commit 8cbb60e476
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
python/MANIFEST.in
View file

@ -1,5 +1,3 @@
include include/olm/olm.h include include/olm/*.h
include include/olm/pk.h
include include/olm/sas.h
include Makefile include Makefile
include olm_build.py include olm_build.py

11
python/olm_build.py
View file

@ -31,13 +31,6 @@ link_args = ["-L../build"]
if DEVELOP and DEVELOP.lower() in ["yes", "true", "1"]: if DEVELOP and DEVELOP.lower() in ["yes", "true", "1"]:
link_args.append('-Wl,-rpath=../build') link_args.append('-Wl,-rpath=../build')
# If libolm is compiled statically, we may need to link to the C++ standard
# library dynamically. This flag allows passing the required linker flag to do
# so.
CXX_LIB = os.environ.get("CXX_LIB")
if CXX_LIB:
link_args.extend(CXX_LIB.split())
headers_build = subprocess.Popen("make headers", shell=True) headers_build = subprocess.Popen("make headers", shell=True)
headers_build.wait() headers_build.wait()
@ -52,7 +45,9 @@ ffibuilder.set_source(
""", """,
libraries=["olm"], libraries=["olm"],
extra_compile_args=compile_args, extra_compile_args=compile_args,
extra_link_args=link_args) extra_link_args=link_args,
source_extension=".cpp", # we need to link the C++ standard library, so use a C++ extension
)
with open(os.path.join(PATH, "include/olm/error.h")) as f: with open(os.path.join(PATH, "include/olm/error.h")) as f:
ffibuilder.cdef(f.read(), override=True) ffibuilder.cdef(f.read(), override=True)