commit: 8af66276be8752d179f5376899e091b79f17463a Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Feb 19 08:24:33 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Feb 20 22:43:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af66276
dev-db/pgpool2: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/19534 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../pgpool2/files/pgpool-configure-memcached.patch | 64 ---------------------- .../pgpool2/files/pgpool-configure-pthread.patch | 13 ----- 2 files changed, 77 deletions(-) diff --git a/dev-db/pgpool2/files/pgpool-configure-memcached.patch b/dev-db/pgpool2/files/pgpool-configure-memcached.patch deleted file mode 100644 index 7b983dba02e..00000000000 --- a/dev-db/pgpool2/files/pgpool-configure-memcached.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -338,37 +338,24 @@ - [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])]) - fi - --AC_ARG_WITH(memcached, -- [ --with-memcached=DIR site header files for libmemcached in DIR], -- [ -- case "$withval" in -- "" | y | ye | yes | n | no) -- AC_MSG_ERROR([*** You must supply an argument to the --with-memcached option.]) -- ;; -- *) -- -- MEMCACHED_INCLUDE_DIR="$withval"/include -- MEMCACHED_LIB_DIR="$withval"/lib -- OLD_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I$MEMCACHED_INCLUDE_DIR" -- AC_CHECK_HEADERS( -- [libmemcached/memcached.h], -- [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])], -- [AC_MSG_ERROR([header file <libmemcached/memcached.h> is required for memcached support])]) -- CFLAGS=$OLD_CFLAGS -- AC_CHECK_LIB(memcached, memcached_create, [], [AC_MSG_ERROR(libmemcached is not installed)]) -- MEMCACHED_INCLUDE_OPT="-I $MEMCACHED_INCLUDE_DIR" -- MEMCACHED_LINK_OPT="-L$MEMCACHED_LIB_DIR" -- MEMCACHED_RPATH_OPT="-rpath $MEMCACHED_LIB_DIR" -- ;; -- esac -- ]) -+AC_ARG_WITH([memcached], -+ AS_HELP_STRING([--with-memcached], [Build with memcached support])) - --CFLAGS="$CFLAGS -fno-strict-aliasing" -+AS_IF([test "x$with_memcached" = "xyes"], [ -+ PKG_CHECK_MODULES([MEMCACHED], [libmemcached]) -+ CFLAGS="$CFLAGS $MEMCACHED_CFLAGS" -+ LIBS="$LIBS $MEMCACHED_LIBS" -+ -+ AC_CHECK_HEADERS( -+ [libmemcached/memcached.h], -+ [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])], -+ [AC_MSG_ERROR([Couldn't find <libmemcached/memcached.h>])]) -+ -+ AC_SEARCH_LIBS(memcached_create, [], [], -+ [AC_MSG_ERROR(libmemcached is not installed)]) -+]) - --AC_SUBST(MEMCACHED_INCLUDE_OPT) --AC_SUBST(MEMCACHED_LINK_OPT) --AC_SUBST(MEMCACHED_RPATH_OPT) -+CFLAGS="$CFLAGS -fno-strict-aliasing" - - OLD_LDFLAGS="$LDFLAGS" - LDFLAGS="-L$PGSQL_LIB_DIR" -@@ -380,7 +367,6 @@ - - AC_SUBST(PGSQL_INCLUDE_DIR) - AC_SUBST(PGSQL_LIB_DIR) --AC_SUBST(MEMCACHED_DIR) - - # --enable(disable)-rpath option - AC_ARG_ENABLE(rpath, diff --git a/dev-db/pgpool2/files/pgpool-configure-pthread.patch b/dev-db/pgpool2/files/pgpool-configure-pthread.patch deleted file mode 100644 index 50b18fab6fc..00000000000 --- a/dev-db/pgpool2/files/pgpool-configure-pthread.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -3,6 +3,10 @@ - - dnl Checks for programs. - AC_PROG_CC -+AX_PTHREAD -+LIBS="$PTHREAD_LIBS $LIBS" -+CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+CC="$PTHREAD_CC" - - AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects]) -
