sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

git:master:438f91b8: http_client Add error parsing for DNS issues with http_proxy
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 438f91b8b5a43516d8904f23be2fa9898fdc465c URL: https://github.com/kamailio/kamailio/commit/438f91b8b5a43516d8904f23be2fa98… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T12:08:25+02:00 http_client Add error parsing for DNS issues with http_proxy --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/438f91b8b5a43516d8904f23be2fa98… Patch: https://github.com/kamailio/kamailio/commit/438f91b8b5a43516d8904f23be2fa98… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index dc75042..546ffc4 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -222,6 +222,8 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const LM_WARN("failed to connect() to host\n"); } else if ( res == CURLE_COULDNT_RESOLVE_HOST ) { LM_WARN("couldn't resolve host\n"); + } else if ( res == CURLE_COULDNT_RESOLVE_PROXY ) { + LM_WARN("couldn't resolve http_proxy host\n"); } else { LM_ERR("failed to perform curl (%d)\n", res); }

1 0

git:master:34ffef46: http_client Debug http_proxy and add http_proxy usage to the http_client_query function
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 34ffef464fbb26c3526990a0bf8b9c5d1cd4ee97 URL: https://github.com/kamailio/kamailio/commit/34ffef464fbb26c3526990a0bf8b9c5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T11:54:53+02:00 http_client Debug http_proxy and add http_proxy usage to the http_client_query function --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/34ffef464fbb26c3526990a0bf8b9c5… Patch: https://github.com/kamailio/kamailio/commit/34ffef464fbb26c3526990a0bf8b9c5… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 3068176..dc75042 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -183,8 +183,11 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const } if (params->http_proxy != NULL) { + LM_DBG("****** ##### CURL proxy [%s] \n", params->http_proxy); res |= curl_easy_setopt(curl, CURLOPT_PROXY, params->http_proxy); - } + } else { + LM_DBG("****** ##### CURL proxy NOT SET \n"); + } if (params->http_proxy_port > 0) { res |= curl_easy_setopt(curl, CURLOPT_PROXYPORT, params->http_proxy_port); @@ -379,7 +382,12 @@ int curl_con_query_url(struct sip_msg* _m, const str *connection, const str* url query_params.oneline = 0; query_params.maxdatasize = maxdatasize; query_params.http_proxy_port = conn->http_proxy_port; - query_params.http_proxy = conn->http_proxy; + if (conn->http_proxy) { + query_params.http_proxy = conn->http_proxy; + LM_DBG("****** ##### CURL proxy [%s] \n", query_params.http_proxy); + } else { + LM_DBG("**** Curl HTTP_proxy not set \n"); + } res = curL_query_url(_m, urlbuf, result, &query_params); @@ -421,6 +429,8 @@ int http_query(struct sip_msg* _m, char* _url, str* _dst, char* _post) query_params.http_follow_redirect = default_http_follow_redirect; query_params.oneline = 1; query_params.maxdatasize = 0; + query_params.http_proxy = as_asciiz(&default_http_proxy); + query_params.http_proxy_port = default_http_proxy_port; res = curL_query_url(_m, _url, _dst, &query_params);

1 0

Broken: kamailio/kamailio#2112 (4.4 - 8ce95cb)
by Travis CI 28 Mar '16

28 Mar '16

Build Update for kamailio/kamailio ------------------------------------- Build: #2112 Status: Broken Duration: 3 minutes and 27 seconds Commit: 8ce95cb (4.4) Author: Daniel-Constantin Mierla Message: Makefile.defs: version set to 4.4.0-rc2 View the changeset: https://github.com/kamailio/kamailio/compare/acb67a89ceba...8ce95cbe27a0 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/118939511 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:4.4:8ce95cbe: Makefile.defs: version set to 4.4.0-rc2
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: 4.4 Commit: 8ce95cbe27a0244ae1db2630bcc8c513485155ca URL: https://github.com/kamailio/kamailio/commit/8ce95cbe27a0244ae1db2630bcc8c51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:22:27+02:00 Makefile.defs: version set to 4.4.0-rc2 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8ce95cbe27a0244ae1db2630bcc8c51… Patch: https://github.com/kamailio/kamailio/commit/8ce95cbe27a0244ae1db2630bcc8c51… --- diff --git a/Makefile.defs b/Makefile.defs index 135dd4f..86ccf38 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -97,7 +97,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:4.4:54395828: Makefile.defs: re-enable pkg malloc
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: 4.4 Commit: 543958280f732c5a9de2fbc7f84ae227e6929098 URL: https://github.com/kamailio/kamailio/commit/543958280f732c5a9de2fbc7f84ae22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:21:26+02:00 Makefile.defs: re-enable pkg malloc - was disabled for compile tests with system malloc --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/543958280f732c5a9de2fbc7f84ae22… Patch: https://github.com/kamailio/kamailio/commit/543958280f732c5a9de2fbc7f84ae22… --- diff --git a/Makefile.defs b/Makefile.defs index 65e7665..135dd4f 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -626,6 +626,7 @@ C_DEFS= $(extra_defs) \ -DSER_VER=$(SER_VER) \ -DCFG_DIR='"$(cfg_target)"'\ -DRUN_DIR='"$(run_target)"'\ + -DPKG_MALLOC \ -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK \ -DUSE_MCAST \

1 0

git: new commits in branch 4.4
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

- URL: https://github.com/kamailio/kamailio/commit/7423c33bfb56268bfa9cb3c03966c37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:03:49+02:00 dispatcher: coherent indentation and whitespacing (cherry picked from commit 1d401e0a9b4c3010c32b0084ec6a218fc46e4f78) - URL: https://github.com/kamailio/kamailio/commit/b53bf975bddf16424d7b6416276371e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:04:14+02:00 ndb_redis: use pkg-config for compile flags (cherry picked from commit 57bcad1b336e7aae5c0933a83ac4ab16f6893896) - URL: https://github.com/kamailio/kamailio/commit/b04d257acd0dddd87051266493a81b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:04:29+02:00 ndb_redis: fix for broken output of pkg-config for hiredis (cherry picked from commit 4a40dd39cec713c569dc3480c905d808026aad39) - URL: https://github.com/kamailio/kamailio/commit/a45f580174ee5b21746e5e0172c55fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:06:00+02:00 cnxcc: use pkg-config for hiredis lib compile flags (cherry picked from commit 162ccdaeeb6bff185f49b3dc2e2b9b43687ec0fc) - URL: https://github.com/kamailio/kamailio/commit/4080d31080b5ad74504715b404e0829… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:06:10+02:00 cnxcc: use pkg-config for libevent compile flags (cherry picked from commit fa0d3267890e77a5184490d11f76fe4cb400e2df) - URL: https://github.com/kamailio/kamailio/commit/410bdba67ec77e87d2ff53f429bc260… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:06:38+02:00 crypto: safety check for memory allocation and free on error cases (cherry picked from commit 181c3cfa266ec5897cc2fdd889d90928f90fcbb8) - URL: https://github.com/kamailio/kamailio/commit/6a65b9ae0432491a1bcf540643f7b90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:06:52+02:00 dispatcher: proper check for ds active ping variable (cherry picked from commit cafb1522b2c27aae404d97fe242324423ccdb99b) - URL: https://github.com/kamailio/kamailio/commit/b28b3d27597b898add46051f24120f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:07:15+02:00 ndb_redis: safety check for log message parameters (cherry picked from commit 0a51e8c941b1c916137eb3e57fa7db86ecb9a1f8) - URL: https://github.com/kamailio/kamailio/commit/ed9ad742f9e9cd0d6e75dc788923add… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:07:25+02:00 lib/trie: init variable to get rid of compile warnings (cherry picked from commit 5075cef8230202138bf08c402797d9dffcb8971d) - URL: https://github.com/kamailio/kamailio/commit/fd20bff1e420a93be588b2c0dd4189f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:07:46+02:00 seas: init variable to get rid of compile warning (cherry picked from commit 3a25e489d0ab8d55d4011ccf62de4f3d8d08b028) - URL: https://github.com/kamailio/kamailio/commit/b667c768dd87575873cec872abdf3ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:08:12+02:00 usrloc: if no location record loaded from db, then no attrs to look up (cherry picked from commit bedd6f4df9d2b5600bed5e31052bc49f8b18382f) - URL: https://github.com/kamailio/kamailio/commit/f229c60396fa8590bbbb2d66cb8006d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:08:23+02:00 http_client: check first if pointer is not exceeding limit - then test its value not to be null char (cherry picked from commit 47a776efcd3d5c2ffafdd780fa169edc85e436d2) - URL: https://github.com/kamailio/kamailio/commit/745e5dd42d032f0343c88d033e3b924… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:08:44+02:00 presence: remove jumping to error from error in update_presentity() - coherent indentation (cherry picked from commit 07dbe3697bcad18f5766fc0d71a7fc48ff8a26d0) - URL: https://github.com/kamailio/kamailio/commit/dec9de968e5894fba808e01614a2965… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:08:55+02:00 core: mem - export pkg api even when using system malloc (cherry picked from commit 33fe5e38d2eefc2244eccb6279c082a789ed0307) - URL: https://github.com/kamailio/kamailio/commit/1a1f3606bde2a4e45ade6212a440e52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:09:12+02:00 p_usrloc: free allocated items in case of no more memory during domain add (cherry picked from commit b27384a0a7c6567a9ecebab3f987079ad0ff7366) - URL: https://github.com/kamailio/kamailio/commit/85a5b41599e9a8a27c10acdc17438b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:09:24+02:00 tm: coherent indentation - removed historical top comments (cherry picked from commit 5d903fd40a9e89d601be25df282a008ba8ba421e) - URL: https://github.com/kamailio/kamailio/commit/bc63f4726541d694da2184a3f41becb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:11:15+02:00 core - mem: renamed api fields for module stats to repleft the purpose (cherry picked from commit 50ac46bfc233531f9f4be22be4aee07a8faa0325) - URL: https://github.com/kamailio/kamailio/commit/792491709f30331e0d53bda610a7614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:11:25+02:00 core: mem/pkg - use module stats fields for init of managers q (cherry picked from commit b568c6533670b1400f7c12bd13169d41542c351a) - URL: https://github.com/kamailio/kamailio/commit/7c521fcbded0a14b8bfa5488511fe0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:11:36+02:00 core: mem/shm - use module stats fields for init of managers (cherry picked from commit 26dbc87aac8d117bf0928eb2124ecc91e512e20f) - URL: https://github.com/kamailio/kamailio/commit/d39d166e753ade7dfbd0f439db03f7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:11:50+02:00 mem/f_malloc: updates to use new api names for module stats (cherry picked from commit ec15fc65bc6d38e74fdcf6a1fa6ef10053452365) - URL: https://github.com/kamailio/kamailio/commit/cb2c14f2dbdbc6fdcb7a0565b271837… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:11:57+02:00 mem/q_malloc: updates to use new api names for module stats (cherry picked from commit 8f2864b1845cfa2b520c0886e30d1f5df285eef6) - URL: https://github.com/kamailio/kamailio/commit/97c2f855920f1aca0d47ed339e11cb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:12:17+02:00 mem/tlsf_malloc: updates to use new api names for module stats (cherry picked from commit 1eafbaf5b2d25879225b8e4c4797285dba2d460f) - URL: https://github.com/kamailio/kamailio/commit/21cb1bf26aed825cc0a2e5d7bdee0d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:12:28+02:00 uuid: detect if pkg-config knows about uuid lib (cherry picked from commit 66fc01f48ea2d6fa8f20f39e1bcd01d498f8580d) - URL: https://github.com/kamailio/kamailio/commit/ef8ee4cd13396bbd4fa2be1cd7b07a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:12:36+02:00 mem: shm - updated macros for mod stats api (cherry picked from commit e5538f1814ed5b96a01c7006d15c9192238c9b19) - URL: https://github.com/kamailio/kamailio/commit/94e0ca56f2fd7ed56b511ab3572484c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:12:47+02:00 http_async_client: use pkg-config for libevent compile flags detection - re-enable pkg-config for libcurl (cherry picked from commit 88d8aabb748d2c0ab476cea9a4a17eb990b618f7) - URL: https://github.com/kamailio/kamailio/commit/acb67a89ceba1428e465b1ff8e052b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T11:12:57+02:00 topos: reused stored branch attributes in case of retransmission (cherry picked from commit a4043c445b0673ca8f5ff7819caf9ac156da1e73)

1 0

git:master:a4043c44: topos: reused stored branch attributes in case of retransmission
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: a4043c445b0673ca8f5ff7819caf9ac156da1e73 URL: https://github.com/kamailio/kamailio/commit/a4043c445b0673ca8f5ff7819caf9ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T10:56:14+02:00 topos: reused stored branch attributes in case of retransmission --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/a4043c445b0673ca8f5ff7819caf9ac… Patch: https://github.com/kamailio/kamailio/commit/a4043c445b0673ca8f5ff7819caf9ac… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index fc39d33..f35eeaf 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -644,8 +644,12 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) tps_storage_lock_get(&lkey); if(dialog==0) { - if(tps_storage_record(msg, ptsd)<0) { - goto error; + if(tps_storage_load_branch(msg, &mtsd, &stsd)!=0) { + if(tps_storage_record(msg, ptsd)<0) { + goto error; + } + } else { + ptsd = &stsd; } } @@ -667,7 +671,7 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) tps_remove_headers(msg, HDR_CONTACT_T); tps_remove_headers(msg, HDR_VIA_T); - tps_reinsert_via(msg, ptsd, &ptsd->x_via1); + tps_reinsert_via(msg, &mtsd, &mtsd.x_via1); if(direction==TPS_DIR_UPSTREAM) { tps_reinsert_contact(msg, ptsd, &ptsd->as_contact); } else {

1 0

git:master:88d8aabb: http_async_client: use pkg-config for libevent compile flags detection
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 88d8aabb748d2c0ab476cea9a4a17eb990b618f7 URL: https://github.com/kamailio/kamailio/commit/88d8aabb748d2c0ab476cea9a4a17eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T10:22:10+02:00 http_async_client: use pkg-config for libevent compile flags detection - re-enable pkg-config for libcurl --- Modified: modules/http_async_client/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/88d8aabb748d2c0ab476cea9a4a17eb… Patch: https://github.com/kamailio/kamailio/commit/88d8aabb748d2c0ab476cea9a4a17eb… --- diff --git a/modules/http_async_client/Makefile b/modules/http_async_client/Makefile index 8ebe26f..a9ae495 100644 --- a/modules/http_async_client/Makefile +++ b/modules/http_async_client/Makefile @@ -5,24 +5,42 @@ include ../../Makefile.defs auto_gen= NAME=http_async_client.so -#ifeq ($(CROSS_COMPILE),) -#CURL_BUILDER=$(shell \ -# if pkg-config --exists libcurl; then \ -# echo 'pkg-config libcurl'; \ -# else \ -# which curl-config; \ -# fi) -#endif +ifeq ($(CROSS_COMPILE),) +CURL_BUILDER=$(shell \ + if pkg-config --exists libcurl; then \ + echo 'pkg-config libcurl'; \ + else \ + which curl-config; \ + fi) +endif ifneq ($(CURL_BUILDER),) - DEFS += $(shell $(CURL_BUILDER) --cflags) - LIBS += $(shell $(CURL_BUILDER) --libs) -else - DEFS+=-I$(LOCALBASE)/include -I$(SYSBASE)/include - LIBS+=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -lcurl -levent + CURLDEFS += $(shell $(CURL_BUILDER) --cflags) + CURLLIBS += $(shell $(CURL_BUILDER) --libs) +else + CURLDEFS+=-I$(LOCALBASE)/include -I$(SYSBASE)/include + CURLLIBS+=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -lcurl -levent +endif + +ifeq ($(CROSS_COMPILE),) +LEVENT_BUILDER = $(shell \ + if pkg-config --exists libevent; then \ + echo 'pkg-config libevent'; \ + fi) endif +ifeq ($(LEVENT_BUILDER),) + LEVENTDEFS=-I$(LOCALBASE)/include -I$(SYSBASE)/include + LEVENTLIBS=-L$(LOCALBASE)/lib -levent +else + LEVENTDEFS = $(shell $(LEVENT_BUILDER) --cflags) + LEVENTLIBS = $(shell $(LEVENT_BUILDER) --libs) +endif + +DEFS+=$(CURLDEFS) $(LEVENTDEFS) +LIBS=$(CURLLIBS) $(LEVENTLIBS) + DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib

1 0

git:master:e5538f18: mem: shm - updated macros for mod stats api
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: e5538f1814ed5b96a01c7006d15c9192238c9b19 URL: https://github.com/kamailio/kamailio/commit/e5538f1814ed5b96a01c7006d15c919… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T14:40:46+02:00 mem: shm - updated macros for mod stats api --- Modified: mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/e5538f1814ed5b96a01c7006d15c919… Patch: https://github.com/kamailio/kamailio/commit/e5538f1814ed5b96a01c7006d15c919… --- diff --git a/mem/shm.h b/mem/shm.h index cbf4c3a..1fdd596 100644 --- a/mem/shm.h +++ b/mem/shm.h @@ -73,8 +73,8 @@ extern sr_shm_api_t _shm_root; # define shm_info(mi) _shm_root.xinfo(_shm_root.mem_block, mi) # define shm_available() _shm_root.xavailable(_shm_root.mem_block) # define shm_sums() _shm_root.xsums(_shm_root.mem_block) -# define shm_mod_get_stats(x) _shm_root.xstats(_shm_root.mem_block, x) -# define shm_mod_free_stats(x) _shm_root.xfstats(x) +# define shm_mod_get_stats(x) _shm_root.xmodstats(_shm_root.mem_block, x) +# define shm_mod_free_stats(x) _shm_root.xfmodstats(x) void* shm_core_get_pool(void);

1 0

git:master:66fc01f4: uuid: detect if pkg-config knows about uuid lib
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 66fc01f48ea2d6fa8f20f39e1bcd01d498f8580d URL: https://github.com/kamailio/kamailio/commit/66fc01f48ea2d6fa8f20f39e1bcd01d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T14:40:09+02:00 uuid: detect if pkg-config knows about uuid lib --- Modified: modules/uuid/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/66fc01f48ea2d6fa8f20f39e1bcd01d… Patch: https://github.com/kamailio/kamailio/commit/66fc01f48ea2d6fa8f20f39e1bcd01d… --- diff --git a/modules/uuid/Makefile b/modules/uuid/Makefile index 102e577..3fe7864 100644 --- a/modules/uuid/Makefile +++ b/modules/uuid/Makefile @@ -6,12 +6,15 @@ auto_gen= NAME=uuid.so ifeq ($(CROSS_COMPILE),) - BUILDER = $(shell which pkg-config) +BUILDER = $(shell \ + if pkg-config --exists uuid; then \ + echo 'pkg-config uuid'; \ + fi) endif ifneq ($(BUILDER),) - DEFS += $(shell $(BUILDER) --cflags uuid) - LIBS += $(shell $(BUILDER) --libs uuid) + DEFS += $(shell $(BUILDER) --cflags) + LIBS += $(shell $(BUILDER) --libs) else DEFS +=-I$(LOCALBASE)/include -I$(SYSBASE)/include LIBS+=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -luuid

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016