net-misc/dhcpcd: add patch to fix compile issue for bug #579854

Package-Manager: portage-2.2.26

diff --git a/net-misc/dhcpcd/dhcpcd-6.10.2.ebuild b/net-misc/dhcpcd/dhcpcd-6.10.2.ebuild
index 0b616f0955c541a5483be56bbea4410925a020ac..cdd7e07bc2b3b74f57326130768f6a4576cf8a96 100644 (file)
--- a/net-misc/dhcpcd/dhcpcd-6.10.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.10.2.ebuild
@@ -27,6 +27,10 @@ COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
+PATCHES=(
+"${FILESDIR}"/${P}-fix-configure.patch
+)
+
 if [[ ${PV} == "9999" ]]; then
        DEPEND+=" dev-vcs/fossil"
 

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
new file mode 100644 (file)
index 0000000..97cc2fa
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch
@@ -0,0 +1,45 @@
+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>
+