Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
dcdb
dcdb
Commits
f99ff2f7
Commit
f99ff2f7
authored
Sep 27, 2019
by
Michael Ott
Browse files
Fix libgcrypt compilation issues
parent
15ffd5f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
dependencies.mk
View file @
f99ff2f7
...
...
@@ -58,7 +58,7 @@ FETCH = wget -c --no-check-certificate -O
MD5
=
$(
if
$(
shell
which md5 2>/dev/null
)
,md5,
$(
if
$(
shell
md5sum
--tag
Makefile 2&> /dev/null
||
true
)
,md5sum
--tag
,openssl md5
))
DISTFILESNAMES
=
$(
foreach
f,
$(DISTFILES)
,
$(
shell
echo
"
$(f)
"
|
sed
's/;.*//'
))
DISTFILESPATHS_FULL
=
$(
foreach
f,
$(DISTFILES)
,
$(
shell
echo
"
$(f)
"
|
sed
's/.tar.gz;.*//; s/.tgz;.*//; s/.zip;.*//'
))
DISTFILESPATHS
=
apache-cassandra-
$(CASSANDRA_VERSION)
mosquitto-
$(MOSQUITTO_VERSION)
boost_
$(BOOST_VERSION_U)
openssl-
$(OPENSSL_VERSION)
libuv-v
$(LIBUV_VERSION)
cpp-driver-
$(CPPDRV_VERSION)
opencv-
$(OPENCV_VERSION)
mariadb-connector-c-
$(MARIADBCONNECTOR_VERSION)
-src
DISTFILESPATHS
=
apache-cassandra-
$(CASSANDRA_VERSION)
mosquitto-
$(MOSQUITTO_VERSION)
boost_
$(BOOST_VERSION_U)
openssl-
$(OPENSSL_VERSION)
libuv-v
$(LIBUV_VERSION)
cpp-driver-
$(CPPDRV_VERSION)
opencv-
$(OPENCV_VERSION)
ifneq
(,$(findstring bacnet,$(PLUGINS)))
DISTFILESPATHS
+=
bacnet-stack-
$
(
BACNET-STACK_VERSION
)
endif
...
...
@@ -251,7 +251,7 @@ $(DCDBDEPSPATH)/libgpg-error-$(GPG-ERROR_VERSION)/.installed: $(DCDBDEPSPATH)/li
$(DCDBDEPSPATH)/libgcrypt-$(GCRYPT_VERSION)/.built
:
$(DCDBDEPSPATH)/libgcrypt-$(GCRYPT_VERSION)/.patched
@
echo
""
@
echo
"Building gcrypt library..."
cd
$
(
@D
)
&&
./configure
--prefix
=
$(DCDBDEP
LOY
PATH)
--with-libgpg-error
-prefix
=
$(DCDBDEPLOYPATH)
cd
$
(
@D
)
&&
CFLAGS
=
"-I
$(DCDBDEPSPATH)
/libgpg-error-
$
(GPG-ERROR_VERSION)/src"
LDFLAGS
=
"-L
$(DCDBDEP
S
PATH)
/libgpg-error-
$
(GPG-ERROR_VERSION)/src/.libs"
PATH
=
$(DCDBDEPSPATH)
/libgpg-error-
$
(
GPG-ERROR_VERSION
)
/src:
$(PATH)
./configure
-
-prefix
=
$(DCDBDEPLOYPATH)
cd
$
(
@D
)
&&
make
-j
$(MAKETHREADS)
&&
touch
$
(
@
)
$(DCDBDEPSPATH)/libgcrypt-$(GCRYPT_VERSION)/.installed
:
$(DCDBDEPSPATH)/libgcrypt-$(GCRYPT_VERSION)/.built
...
...
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