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 B01A1139086 for ; Sun, 22 Jan 2017 21:09:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3BA323407F; Sun, 22 Jan 2017 21:09:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2C5B23407E for ; Sun, 22 Jan 2017 21:09:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0149034168D for ; Sun, 22 Jan 2017 21:09:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 964B02CDE for ; Sun, 22 Jan 2017 21:09:43 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1485119352.0a20aa6ea5ad8fdbf769888c340e4c17bae39231.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch X-VCS-Directories: net-misc/dhcpcd/files/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 0a20aa6ea5ad8fdbf769888c340e4c17bae39231 X-VCS-Branch: master Date: Sun, 22 Jan 2017 21:09:43 +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: 650f488d-7876-43e8-97a6-7b4ee126c30b X-Archives-Hash: 2c0b964c860ee186487fca423e1b052e commit: 0a20aa6ea5ad8fdbf769888c340e4c17bae39231 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Thu Jan 19 17:25:13 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jan 22 21:09:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a20aa6e net-misc/dhcpcd: remove unused patch (cherry picked from commit 136eb80cdccd213cfd041cc9132e0efdab65a346) Fixes: https://github.com/gentoo/gentoo/pull/3542 Signed-off-by: Robin H. Johnson gentoo.org> .../dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch | 45 ---------------------- 1 file changed, 45 deletions(-) diff --git a/net-misc/dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch b/net-misc/dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch deleted file mode 100644 index 97cc2fa..00000000 --- a/net-misc/dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: configure -================================================================== ---- a/configure -+++ b/configure -@@ -360,19 +360,10 @@ - esac - else - echo "CPPFLAGS+= -DNDEBUG" >>$CONFIG_MK - fi - --if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then -- echo "dhcpcd-definitions.conf will be embedded in dhcpcd itself" -- echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK --else -- echo "dhcpcd-definitions.conf will be installed to $LIBEXECDIR" -- echo "CFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK -- echo "EMBEDDEDINSTALL= _embeddedinstall" >>$CONFIG_MK --fi -- - if [ -n "$FORK" -a "$FORK" != yes -a "$FORK" != true ]; then - echo "There is no fork" - echo "CPPFLAGS+= -DTHERE_IS_NO_FORK" >>$CONFIG_MK - fi - -@@ -460,10 +451,19 @@ - echo "$CC does not create executables" >&2 - exit 1 - fi - [ "$CC" != cc ] && echo "CC= $CC" >>$CONFIG_MK - $CC --version | $SED -e '1!d' -+ -+if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then -+ echo "dhcpcd-definitions.conf will be embedded in dhcpcd itself" -+ echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK -+else -+ echo "dhcpcd-definitions.conf will be installed to $LIBEXECDIR" -+ echo "CPPFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK -+ echo "EMBEDDEDINSTALL= _embeddedinstall" >>$CONFIG_MK -+fi - - if [ "$OS" = linux ]; then - printf "Testing for nl80211 ... " - cat <_nl80211.c - #include -