Attachment 186831 Details for Bug 222718 – Makes Python, RabbitMQ and Redis optional

[patch] Makes Python, RabbitMQ and Redis optional

opensips.patch (text/plain), 5.93 KB, created by OlivierW on 2017-10-01 14:46:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: OlivierW

Created: 2017-10-01 14:46:06 UTC

Size: 5.93 KB

patch

obsolete

>--- Makefile.orig	2017-10-01 01:35:36.202557000 +0200
>+++ Makefile	2017-10-01 12:33:33.376653000 +0200
>@@ -17,20 +17,13 @@
> 			libxmlrpc.so:net/xmlrpc-c \
> 			libpcre.so:devel/pcre \
> 			libconfuse.so:devel/libconfuse \
>-			librabbitmq.so:net/rabbitmq-c-devel \
>-			libhiredis.so:databases/hiredis \
> 			libexpat.so:textproc/expat2 \
>-			libpython2.7.so:lang/python27 \
> 			libcurl.so:ftp/curl \
> 			libjson-c.so:devel/json-c
> BUILD_DEPENDS=		ginstall:sysutils/coreutils \
> 			gtar:archivers/gtar \
>-			gm4:devel/m4 \
>-			redis-server:databases/redis-devel \
>-			python2:lang/python2 \
>-			python:lang/python
>+			gm4:devel/m4
> RUN_DEPENDS=		${LOCALBASE}/bin/bash:shells/bash \
>-			${LOCALBASE}/bin/python2:lang/python2 \
> 			${LOCALBASE}/bin/grep:textproc/gnugrep
> 
> GINSTALL=		ginstall
>@@ -46,14 +39,15 @@
> NOPRECIOUSMAKEVARS=	yes
> 
> OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL \
>-			PGSQL RADIUS TESTS TLS UNIXODBC SQLITE
>-OPTIONS_DEFAULT=	GEOIP HTTP LDAP MEMCACHED PGSQL RADIUS TLS
>+			PGSQL PYTHON RABBITMQ RADIUS REDIS TESTS TLS UNIXODBC SQLITE
>+OPTIONS_DEFAULT=	GEOIP HTTP LDAP MEMCACHED PGSQL PYTHON RABBITMQ RADIUS REDIS TLS
> OPTIONS_SUB=		yes
> 
> GEOIP_DESC=		Build with GeoIP support
> HTTP_DESC=		Enable HTTP transport via libmicrohttpd
> MEMCACHED_DESC=		Build with memcached support
> TESTS_DESC=		Install smoke tests
>+RABBITMQ_DESC=	RabbitMQ/AMQP support
> 
> LDAP_USE=		OPENLDAP=client
> MYSQL_USE=		MYSQL=client
>@@ -66,6 +60,13 @@
> MEMCACHED_LIB_DEPENDS+=	libmemcached.so:databases/libmemcached
> UNIXODBC_LIB_DEPENDS+=	libodbc.so:databases/unixODBC
> SQLITE_LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
>+PYTHON_LIB_DEPENDS+=	libpython2.7.so:lang/python27
>+PYTHON_BUILD_DEPENDS+=	python2:lang/python2 \
>+						python:lang/python
>+PYTHON_RUN_DEPENDS+=	${LOCALBASE}/bin/python2:lang/python2
>+RABBITMQ_LIB_DEPENDS+=	librabbitmq.so:net/rabbitmq-c-devel
>+REDIS_LIB_DEPENDS+=	libhiredis.so:databases/hiredis
>+REDIS_BUILD_DEPENDS+=	redis-server:databases/redis-devel
> 
> SHEBANG_FILES=		ccopts.sh \
> 			ccver.sh \
>@@ -187,6 +188,18 @@
> EXTRA_MODULES+=		db_sqlite
> .endif
> 
>+.if ${PORT_OPTIONS:MPYTHON}
>+EXTRA_MODULES+=		python
>+.endif
>+
>+.if ${PORT_OPTIONS:MRABBITMQ}
>+EXTRA_MODULES+=		event_rabbitmq
>+.endif
>+
>+.if ${PORT_OPTIONS:MREDIS}
>+EXTRA_MODULES+=		cachedb_redis
>+.endif
>+
> OPENSIPS_MAKE_ENV=	CC="${CC}" CXX="${CXX}" CPP="${CPP}" _GCC_RUNTIME="${_GCC_RUNTIME}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
> 
> do-configure:
>--- files/Makefile.conf.orig	2017-10-01 11:02:53.991194000 +0200
>+++ files/Makefile.conf	2017-10-01 12:18:21.621632000 +0200
>@@ -54,7 +54,7 @@
> 
> exclude_modules= aaa_radius b2b_logic cachedb_cassandra cachedb_couchbase cachedb_memcached cachedb_mongodb cachedb_redis carrierroute compression cpl-c db_berkeley db_http db_mysql db_oracle db_perlvdb db_postgres db_unixodbc dialplan emergency event_rabbitmq h350 regex identity jabber json ldap lua httpd mi_xmlrpc_ng mmgeoip osp perl pi_http presence presence_dialoginfo presence_mwi presence_xml proto_sctp proto_tls pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rest_client rls sngtc snmpstats xcap xcap_client xmpp db_sqlite
> 
>-include_modules= b2b_logic cachedb_redis carrierroute cpl-c dialplan event_rabbitmq regex identity jabber json mi_xmlrpc_ng perl pi_http presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rest_client rls xcap xcap_client xmpp
>+include_modules= b2b_logic carrierroute cpl-c dialplan regex identity jabber json mi_xmlrpc_ng perl pi_http presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp rest_client rls xcap xcap_client xmpp
> 
> DEFS+= -DPKG_MALLOC #Uses a faster malloc (exclusive w/ USE_SHM_MEM)
> DEFS+= -DSHM_MMAP #Use mmap instead of SYSV shared memory
>--- pkg-plist.orig	2017-10-01 12:04:52.086677000 +0200
>+++ pkg-plist	2017-10-01 12:18:51.653102000 +0200
>@@ -28,7 +28,7 @@
> lib/opensips/modules/benchmark.so
> lib/opensips/modules/cachedb_local.so
> %%MEMCACHED%%lib/opensips/modules/cachedb_memcached.so
>-lib/opensips/modules/cachedb_redis.so
>+%%REDIS%%lib/opensips/modules/cachedb_redis.so
> lib/opensips/modules/cachedb_sql.so
> lib/opensips/modules/call_center.so
> lib/opensips/modules/call_control.so
>@@ -55,7 +55,7 @@
> lib/opensips/modules/enum.so
> lib/opensips/modules/event_datagram.so
> lib/opensips/modules/event_flatstore.so
>-lib/opensips/modules/event_rabbitmq.so
>+%%RABBITMQ%%lib/opensips/modules/event_rabbitmq.so
> lib/opensips/modules/event_route.so
> lib/opensips/modules/event_virtual.so
> lib/opensips/modules/event_xmlrpc.so
>@@ -108,7 +108,7 @@
> lib/opensips/modules/pua_mi.so
> lib/opensips/modules/pua_usrloc.so
> lib/opensips/modules/pua_xmpp.so
>-lib/opensips/modules/python.so
>+%%PYTHON%%lib/opensips/modules/python.so
> lib/opensips/modules/qos.so
> lib/opensips/modules/ratelimit.so
> lib/opensips/modules/regex.so
>@@ -208,7 +208,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.benchmark
> %%PORTDOCS%%%%DOCSDIR%%/README.cachedb_local
> %%MEMCACHED%%%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_memcached
>-%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_redis
>+%%REDIS%%%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_redis
> %%PORTDOCS%%%%DOCSDIR%%/README.cachedb_sql
> %%PORTDOCS%%%%DOCSDIR%%/README.call_center
> %%PORTDOCS%%%%DOCSDIR%%/README.call_control
>@@ -235,7 +235,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.enum
> %%PORTDOCS%%%%DOCSDIR%%/README.event_datagram
> %%PORTDOCS%%%%DOCSDIR%%/README.event_flatstore
>-%%PORTDOCS%%%%DOCSDIR%%/README.event_rabbitmq
>+%%RABBITMQ%%%%PORTDOCS%%%%DOCSDIR%%/README.event_rabbitmq
> %%PORTDOCS%%%%DOCSDIR%%/README.event_route
> %%PORTDOCS%%%%DOCSDIR%%/README.event_virtual
> %%PORTDOCS%%%%DOCSDIR%%/README.event_xmlrpc
>@@ -288,7 +288,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.pua_mi
> %%PORTDOCS%%%%DOCSDIR%%/README.pua_usrloc
> %%PORTDOCS%%%%DOCSDIR%%/README.pua_xmpp
>-%%PORTDOCS%%%%DOCSDIR%%/README.python
>+%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/README.python
> %%PORTDOCS%%%%DOCSDIR%%/README.qos
> %%PORTDOCS%%%%DOCSDIR%%/README.ratelimit
> %%PORTDOCS%%%%DOCSDIR%%/README.regex

Actions: View | Diff

Attachments on bug 222718: 186831 | 190589 | 225748 | 227759