gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/dhcpcd: remove unused patch

Browse Source 
(cherry picked from commit 136eb80cdccd213cfd041cc9132e0efdab65a346)
Fixes: https://github.com/gentoo/gentoo/pull/3542
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger (asterix)
2017-01-19 18:25:13 +01:00
committed by Robin H. Johnson
parent a182366966
commit 0a20aa6ea5
1 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
net-misc/dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch
View File

@@ -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 <<EOF >_nl80211.c
#include <linux/nl80211.h>