Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
2aad86ea
Commit
2aad86ea
authored
Jun 17, 2021
by
Hubert Chathi
Browse files
fix Python build
parent
9a8b4219
Pipeline
#6512
passed with stages
in 2 minutes and 43 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
python/Makefile
View file @
2aad86ea
all
:
olm-python2 olm-python3
OLM_HEADERS
=
../include/olm/olm.h ../include/olm/inbound_group_session.h
\
../include/olm/outbound_group_session.h
\
../include/olm/outbound_group_session.h
include/olm/olm.h
:
$(OLM_HEADERS)
mkdir
-p
include/olm
...
...
@@ -10,12 +10,15 @@ include/olm/olm.h: $(OLM_HEADERS)
echo
'void *memset(void *s, int c, size_t n);'
>>
include/olm/olm.h
include/olm/pk.h
:
include/olm/olm.h ../include/olm/pk.h
$(CPP)
-I
dummy
-I
../include
-o
include/olm/pk.h ../include/olm/pk.h
$(CPP)
-I
dummy
-I
../include
-o
include/olm/pk.h ../include/olm/pk.h
include/olm/sas.h
:
include/olm/olm.h ../include/olm/sas.h
$(CPP)
-I
dummy
-I
../include
-o
include/olm/sas.h ../include/olm/sas.h
headers
:
include/olm/olm.h include/olm/pk.h include/olm/sas.h
include/olm/error.h
:
include/olm/olm.h ../include/olm/error.h
$(CPP)
-I
dummy
-I
../include
-o
include/olm/error.h ../include/olm/error.h
headers
:
include/olm/olm.h include/olm/pk.h include/olm/sas.h include/olm/error.h
olm-python2
:
headers
DEVELOP
=
$(DEVELOP)
python2 setup.py build
...
...
python/dummy/olm/error.h
0 → 100644
View file @
2aad86ea
python/olm_build.py
View file @
2aad86ea
...
...
@@ -49,6 +49,9 @@ ffibuilder.set_source(
extra_compile_args
=
compile_args
,
extra_link_args
=
link_args
)
with
open
(
os
.
path
.
join
(
PATH
,
"include/olm/error.h"
))
as
f
:
ffibuilder
.
cdef
(
f
.
read
(),
override
=
True
)
with
open
(
os
.
path
.
join
(
PATH
,
"include/olm/olm.h"
))
as
f
:
ffibuilder
.
cdef
(
f
.
read
(),
override
=
True
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment