From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 752CB1384B4 for ; Wed, 18 Nov 2015 19:15:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C495E21C02A; Wed, 18 Nov 2015 19:14:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 474E321C027 for ; Wed, 18 Nov 2015 19:14:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FC703406DD for ; Wed, 18 Nov 2015 19:14:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB839FF9 for ; Wed, 18 Nov 2015 19:14:52 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1447874086.0f05e9d541d5958c3abc9b7ff4e80a025f315c6a.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/openvas-libraries/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch X-VCS-Directories: net-analyzer/openvas-libraries/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 0f05e9d541d5958c3abc9b7ff4e80a025f315c6a X-VCS-Branch: master Date: Wed, 18 Nov 2015 19:14:52 +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: 72a11edc-1d76-47ad-8683-1031e3176a4b X-Archives-Hash: f291ee61bdf51f897cfe51ae8feae051 commit: 0f05e9d541d5958c3abc9b7ff4e80a025f315c6a Author: Justin Lecher gentoo org> AuthorDate: Wed Nov 18 18:18:14 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Nov 18 19:14:46 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f05e9d5 net-analyzer/openvas-libraries: Update patch to work with ld.bfd Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> .../openvas-libraries-8.0.5-underlinking.patch | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch index 3bd1208..817815e 100644 --- a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch +++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch @@ -1,9 +1,9 @@ - base/CMakeLists.txt | 4 ++-- - misc/CMakeLists.txt | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + base/CMakeLists.txt | 10 +++++----- + misc/CMakeLists.txt | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt -index 07febee..512e813 100644 +index 07febee..40305b7 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -73,7 +73,7 @@ if (BUILD_SHARED) @@ -15,15 +15,21 @@ index 07febee..512e813 100644 endif (MINGW) endif (BUILD_SHARED) -@@ -89,7 +89,7 @@ add_custom_indent_targets (${FILES}) +@@ -87,10 +87,10 @@ add_custom_indent_targets (${FILES}) + + # Link the test-hosts executable # TODO: This is currently only built for BUILD_SHARED - if (BUILD_SHARED) - add_executable (test-hosts test-hosts.c) +-if (BUILD_SHARED) +- add_executable (test-hosts test-hosts.c) - target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared ${GLIB_LDFLAGS}) -+ target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared openvas_omp_shared ${GLIB_LDFLAGS}) - endif (BUILD_SHARED) +-endif (BUILD_SHARED) ++#if (BUILD_SHARED) ++# add_executable (test-hosts test-hosts.c) ++# target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared openvas_omp_shared ${GLIB_LDFLAGS}) ++#endif (BUILD_SHARED) ## Install + if (BUILD_STATIC) diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt index 7aaca2c..e7a0870 100644 --- a/misc/CMakeLists.txt