From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C87AA1396D9 for ; Mon, 6 Nov 2017 07:30:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8151E0EBC; Mon, 6 Nov 2017 07:30:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7B32E0EBC for ; Mon, 6 Nov 2017 07:30:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C3EB4341670 for ; Mon, 6 Nov 2017 07:30:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BD1B96AA for ; Mon, 6 Nov 2017 07:30:45 +0000 (UTC) From: "Amy Liffey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Liffey" Message-ID: <1509953433.e1fffbc307ced49f7d240460cbfa89ef6b314288.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/knot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/knot/files/2.5.3-link-with-libatomic.patch X-VCS-Directories: net-dns/knot/files/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Liffey X-VCS-Revision: e1fffbc307ced49f7d240460cbfa89ef6b314288 X-VCS-Branch: master Date: Mon, 6 Nov 2017 07:30:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 56af88a4-9034-4e9f-85cb-9573e8267238 X-Archives-Hash: 3e60a4a8b76a063dc7410db877bfab38 commit: e1fffbc307ced49f7d240460cbfa89ef6b314288 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Nov 5 21:05:29 2017 +0000 Commit: Amy Liffey gentoo org> CommitDate: Mon Nov 6 07:30:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fffbc3 ned-dns/knot: remove unused patch Closes:#6134 net-dns/knot/files/2.5.3-link-with-libatomic.patch | 117 --------------------- 1 file changed, 117 deletions(-) diff --git a/net-dns/knot/files/2.5.3-link-with-libatomic.patch b/net-dns/knot/files/2.5.3-link-with-libatomic.patch deleted file mode 100644 index 14e5366f7d9..00000000000 --- a/net-dns/knot/files/2.5.3-link-with-libatomic.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 5cf2d1acf87fa0ab18375534ca210f1cabf212b3 Mon Sep 17 00:00:00 2001 -From: Pierre-Olivier Mercier -Date: Wed, 2 Aug 2017 23:16:43 +0200 -Subject: [PATCH] Link with libatomic on architectures that requires it - ---- - configure.ac | 10 +++++++++- - src/Makefile.am | 2 +- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2a28214..5bd1798 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -504,8 +504,16 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[cpuset_t* set = cpuset - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])], -- [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])] -+ [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.]) -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([[#include ]], -+ [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])], -+ [atomic_LIBS=""], -+ [atomic_LIBS="-latomic"] -+ )], -+ [atomic_LIBS=""] - ) -+AC_SUBST([atomic_LIBS]) - - # Prepare CFLAG_VISIBILITY to be used where needed - gl_VISIBILITY() -diff --git a/src/Makefile.am b/src/Makefile.am -index 948912e..bf28013 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -399,7 +399,7 @@ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(systemd_CFLAGS) \ - $(liburcu_CFLAGS) -DKNOTD_MOD_STATIC - libknotd_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^knotd_' - libknotd_la_LIBADD = libknot.la zscanner/libzscanner.la $(systemd_LIBS) \ -- $(liburcu_LIBS) -+ $(liburcu_LIBS) $(atomic_LIBS) - - ################### - # Knot DNS Daemon # ---- a/src/Makefile.in 2017-08-05 18:09:14.029882010 +0200 -+++ b/src/Makefile.in 2017-08-05 18:12:43.541190937 +0200 -@@ -379,7 +379,7 @@ - @STATIC_MODULE_dnstap_TRUE@ contrib/dnstap/libdnstap.la - libknotd_la_DEPENDENCIES = libknot.la zscanner/libzscanner.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_2) -+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) - am__libknotd_la_SOURCES_DIST = knot/conf/base.c knot/conf/base.h \ - knot/conf/conf.c knot/conf/conf.h knot/conf/confdb.c \ - knot/conf/confdb.h knot/conf/confio.c knot/conf/confio.h \ -@@ -937,6 +937,7 @@ - am__quote = @am__quote@ - am__tar = @am__tar@ - am__untar = @am__untar@ -+atomic_LIBS = @atomic_LIBS@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ -@@ -1275,7 +1276,8 @@ - $(am__append_11) - libknotd_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^knotd_' - libknotd_la_LIBADD = libknot.la zscanner/libzscanner.la \ -- $(systemd_LIBS) $(liburcu_LIBS) $(am__append_12) -+ $(systemd_LIBS) $(liburcu_LIBS) $(atomic_LIBS) \ -+ $(am__append_12) - @HAVE_DAEMON_TRUE@sbin_SCRIPTS = utils/pykeymgr/pykeymgr - @HAVE_DAEMON_TRUE@CLEAN_FILES = $(sbin_SCRIPTS) - @HAVE_DAEMON_TRUE@knotddir = $(includedir)/knot ---- a/configure 2017-08-05 18:09:14.039882551 +0200 -+++ b/configure 2017-08-05 18:12:18.779857706 +0200 -@@ -655,6 +655,7 @@ - CODE_COVERAGE_ENABLED_TRUE - HAVE_VISIBILITY - CFLAG_VISIBILITY -+atomic_LIBS - libidn_LIBS - libidn_CFLAGS - libidn2_LIBS -@@ -16347,10 +16358,32 @@ - - $as_echo "#define HAVE_ATOMIC 1" >>confdefs.h - -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ atomic_LIBS="" -+else -+ atomic_LIBS="-latomic" -+ -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+else -+ atomic_LIBS="" - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -+ - # Prepare CFLAG_VISIBILITY to be used where needed - -