diff options
| author | Nathan Angelacos <nangel@alpinelinux.org> | 2016-08-26 23:39:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-28 02:54:58 +0000 |
| commit | 8542dcd91ca8f397d16cb1875abe90221dc23663 (patch) | |
| tree | 495459454c31f8750a271992d164c6337c82482d /testing/rmilter/system_hiredis.patch | |
| parent | b127113bd524cda938017fed32cdd407a15f3df4 (diff) | |
| download | aports-8542dcd91ca8f397d16cb1875abe90221dc23663.tar.bz2 aports-8542dcd91ca8f397d16cb1875abe90221dc23663.tar.xz | |
testing/rmilter version bump to 1.9.2
refreshed patch files
no man pages in upstream source; removed -doc package
Diffstat (limited to 'testing/rmilter/system_hiredis.patch')
| -rw-r--r-- | testing/rmilter/system_hiredis.patch | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/testing/rmilter/system_hiredis.patch b/testing/rmilter/system_hiredis.patch index 3dfdf54519..006eb5ffad 100644 --- a/testing/rmilter/system_hiredis.patch +++ b/testing/rmilter/system_hiredis.patch @@ -1,28 +1,30 @@ ---- old/CMakeLists.txt -+++ new/CMakeLists.txt -@@ -245,6 +245,8 @@ - ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) - ProcessPackage(LIBMILTER LIBRARY milter INCLUDE mfapi.h INCLUDE_SUFFIXES include/libmilter +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) - - IF(ENABLE_DKIM MATCHES "ON") - SET(WITH_DKIM 1) -@@ -363,8 +365,6 @@ - CHECK_SYMBOL_EXISTS(MAP_NOCORE sys/mman.h HAVE_MMAP_NOCORE) ++ LIB_SUFFIXES lib/libhiredis ROOT ${LIBHIREDIS_ROOT_DIR} MODULES libhiredis) + 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") + ENDIF() ################################ SOURCES SECTION ########################### -ADD_SUBDIRECTORY(hiredis) -INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/hiredis") - - SET(RMILTERSRC - compat/blake2b-ref.c -@@ -394,7 +394,6 @@ + INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/lc-btrie") + ADD_SUBDIRECTORY(contrib/libucl) + ADD_SUBDIRECTORY(contrib/http-parser) +@@ -419,7 +419,6 @@ CONFIGURE_FILE(config.h.in config.h) ADD_EXECUTABLE(rmilter ${RMILTERSRC}) SET_TARGET_PROPERTIES(rmilter PROPERTIES LINKER_LANGUAGE C) TARGET_LINK_LIBRARIES(rmilter ${RMILTER_REQUIRED_LIBRARIES}) -TARGET_LINK_LIBRARIES(rmilter rmilter-hiredis) - - ##################### INSTALLATION ########################################## - + TARGET_LINK_LIBRARIES(rmilter ucl) + TARGET_LINK_LIBRARIES(rmilter xxhash) + TARGET_LINK_LIBRARIES(rmilter rmilter-http-parser) |