Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
79cdfc15
Commit
79cdfc15
authored
1 year ago
by
Kateryna Kostiuk
Browse files
Options
Downloads
Patches
Plain Diff
contrib: update dhtnet
Change-Id: I3f6ef655d88039e401ff00bcad5992db38357c69
parent
37760d60
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
contrib/src/dhtnet/libjami-testable.patch
+0
-20
0 additions, 20 deletions
contrib/src/dhtnet/libjami-testable.patch
contrib/src/dhtnet/package.json
+1
-1
1 addition, 1 deletion
contrib/src/dhtnet/package.json
contrib/src/dhtnet/rules.mak
+1
-2
1 addition, 2 deletions
contrib/src/dhtnet/rules.mak
with
2 additions
and
23 deletions
contrib/src/dhtnet/libjami-testable.patch
deleted
100644 → 0
+
0
−
20
View file @
37760d60
CMakeLists.txt | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d14bc98..e5ad5c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,12 @@
option(DHTNET_TESTABLE "Enable API for tests" ON)
option(BUILD_TOOLS "Build tools" ON)
if (NOT MSVC)
+ OPTION(LIBJAMI_TESTABLE "Enable API for tests" ON)
+
+ IF(LIBJAMI_TESTABLE)
+ ADD_DEFINITIONS(-DLIBJAMI_TESTABLE)
+ ENDIF(LIBJAMI_TESTABLE)
+
find_package (PkgConfig REQUIRED)
find_package(msgpack-cxx CONFIG)
This diff is collapsed.
Click to expand it.
contrib/src/dhtnet/package.json
+
1
−
1
View file @
79cdfc15
{
"name"
:
"dhtnet"
,
"version"
:
"4
796de15ed32b41949489c328bc250d17c431c80
"
,
"version"
:
"4
01c52e8b7b3d8dcfede38177f0cc3a1efae044f
"
,
"url"
:
"https://review.jami.net/plugins/gitiles/dhtnet/+archive/__VERSION__.tar.gz"
,
"deps"
:
[
"opendht"
,
...
...
This diff is collapsed.
Click to expand it.
contrib/src/dhtnet/rules.mak
+
1
−
2
View file @
79cdfc15
# DHTNET
DHTNET_VERSION
:=
4
796de15ed32b41949489c328bc250d17c431c80
DHTNET_VERSION
:=
4
01c52e8b7b3d8dcfede38177f0cc3a1efae044f
DHTNET_URL
:=
https://review.jami.net/plugins/gitiles/dhtnet/+archive/
$(
DHTNET_VERSION
)
.tar.gz
PKGS
+=
dhtnet
...
...
@@ -31,7 +31,6 @@ $(TARBALLS)/dhtnet-$(DHTNET_VERSION).tar.gz:
dhtnet
:
dhtnet-$(DHTNET_VERSION).tar.gz
mkdir
-p
$(
UNPACK_DIR
)
$(
UNPACK
)
-C
$(
UNPACK_DIR
)
$(
APPLY
)
$(
SRC
)
/dhtnet/libjami-testable.patch
$(
MOVE
)
.dhtnet
:
dhtnet toolchain.cmake .sum-dhtnet
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment