diff options
| author | Valery Kartel <valery.kartel@gmail.com> | 2016-11-28 18:40:10 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-12-26 10:01:53 +0000 |
| commit | b3d10d56958485c034a5c66d006ee680644d5b77 (patch) | |
| tree | d84d7d16b61afad2aeb2773754fcbbf2dc75ead7 /testing/rmilter/system_hiredis.patch | |
| parent | 8db10f90bc1848cd8050dfe0df9cc40671225d39 (diff) | |
| download | aports-b3d10d56958485c034a5c66d006ee680644d5b77.tar.bz2 aports-b3d10d56958485c034a5c66d006ee680644d5b77.tar.xz | |
testing/rmilter: upgrade to 1.10.0, implemented an idea of modular design
--
- subpackages adds more functionality in one click
- made a kind of automatic service dependency for external local services
Diffstat (limited to 'testing/rmilter/system_hiredis.patch')
| -rw-r--r-- | testing/rmilter/system_hiredis.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/testing/rmilter/system_hiredis.patch b/testing/rmilter/system_hiredis.patch index 006eb5ffad..d72e9cd03d 100644 --- a/testing/rmilter/system_hiredis.patch +++ b/testing/rmilter/system_hiredis.patch @@ -1,26 +1,24 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae4dbc4..216b177 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -367,6 +367,8 @@ ProcessPackage(LIBMILTER LIBRARY milter INCLUDE mfapi.h INCLUDE_SUFFIXES include - LIB_SUFFIXES lib/libmilter ROOT ${LIBMILTER_ROOT_DIR} MODULES libmilter) - ProcessPackage(PCRE LIBRARY pcre INCLUDE pcre.h INCLUDE_SUFFIXES include/pcre - ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) -+ProcessPackage(LIBHIREDIS LIBRARY hiredis INCLUDE hiredis.h INCLUDE_SUFFIXES include/hiredis -+ LIB_SUFFIXES lib/libhiredis ROOT ${LIBHIREDIS_ROOT_DIR} MODULES libhiredis) +@@ -370,6 +370,8 @@ ProcessPackage(GLIB2 LIBRARY glib-2.0 INCLUDE glib.h INCLUDE_SUFFIXES include/glib ROOT ${GLIB_ROOT_DIR} MODULES glib-2.0>=2.28) -@@ -388,8 +390,6 @@ IF(ENABLE_MEMCACHED MATCHES "ON") ++ProcessPackage(LIBHIREDIS LIBRARY hiredis INCLUDE hiredis.h INCLUDE_SUFFIXES include/hiredis ++ LIB_SUFFIXES lib/libhiredis ROOT ${LIBHIREDIS_ROOT_DIR} MODULES libhiredis) + + IF(ENABLE_DKIM MATCHES "ON") + SET(WITH_DKIM 1) +@@ -388,8 +390,6 @@ ENDIF() ################################ SOURCES SECTION ########################### -ADD_SUBDIRECTORY(hiredis) -INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/hiredis") INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/lc-btrie") + INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/") ADD_SUBDIRECTORY(contrib/libucl) - ADD_SUBDIRECTORY(contrib/http-parser) -@@ -419,7 +419,6 @@ CONFIGURE_FILE(config.h.in config.h) +@@ -421,7 +421,6 @@ ADD_EXECUTABLE(rmilter ${RMILTERSRC}) SET_TARGET_PROPERTIES(rmilter PROPERTIES LINKER_LANGUAGE C) TARGET_LINK_LIBRARIES(rmilter ${RMILTER_REQUIRED_LIBRARIES}) |