[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] /srv/bzr/gsrc/trunk r1320: fix zrtp build
From: |
Brandon Invergo |
Subject: |
[Gsrc-commit] /srv/bzr/gsrc/trunk r1320: fix zrtp build |
Date: |
Thu, 06 Dec 2012 13:42:30 +0100 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 1320
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Thu 2012-12-06 13:42:30 +0100
message:
fix zrtp build
modified:
gnu/zrtp/Makefile
gnu/zrtp/config.mk
=== modified file 'gnu/zrtp/Makefile'
--- a/gnu/zrtp/Makefile 2012-12-04 22:14:07 +0000
+++ b/gnu/zrtp/Makefile 2012-12-06 12:42:30 +0000
@@ -19,3 +19,14 @@
include ../../gar.lib/auto.mk
include config.mk
+
+# CMake seems to ignore most environment variables. In this case,
+# libzrtp requires OpenSSL 0.98, which GSRC does not provide, but
+# since CMake does not seem to honor the PKG_CONFIG_PATH variable
+# and since GSRC tries to use its own pkg-build by default, it cannot
+# find the library. Here we remove the argument to use GSRC's pkg-config
+# so that the thing will at least build.
+CMAKE_CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=$(prefix) \
+ -DSYSCONFDIR=$(sysconfdir) \
+ $(CONFIGURE_OPTS)
+
=== modified file 'gnu/zrtp/config.mk'
--- a/gnu/zrtp/config.mk 2012-11-21 22:40:49 +0000
+++ b/gnu/zrtp/config.mk 2012-12-06 12:42:30 +0000
@@ -1,4 +1,4 @@
## Configuration options for zrtp ##
-CONFIGURE_OPTS ?=
+CONFIGURE_OPTS ?= -DENABLE_CRYPT_STANDALONE=true
BUILD_OPTS ?=
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] /srv/bzr/gsrc/trunk r1320: fix zrtp build,
Brandon Invergo <=