summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIsmael Luceno2021-01-21 18:42:48 +0100
committerIsmael Luceno2021-01-21 19:14:45 +0100
commit73b4a714461543c8dee513aa2f5f60a798fec274 (patch)
tree787f181f29f0bbc7a2b1deb0b2f0ac24ab393555 /net
parent583cb95b8a4c3f80ea4351b6fd1709bf7e9820e9 (diff)
iputils-ping: Replace patch to the Makefile with parameter
Diffstat (limited to 'net')
-rw-r--r--net/iputils-ping/0001-build-ping.patch25
-rwxr-xr-xnet/iputils-ping/BUILD2
-rw-r--r--net/iputils-ping/HISTORY4
-rwxr-xr-xnet/iputils-ping/PRE_BUILD2
4 files changed, 5 insertions, 28 deletions
diff --git a/net/iputils-ping/0001-build-ping.patch b/net/iputils-ping/0001-build-ping.patch
deleted file mode 100644
index 6a5085e910..0000000000
--- a/net/iputils-ping/0001-build-ping.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cce5ff737c67ed319b7d146c117ddeaa04969257 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf@bandrate.org>
-Date: Tue, 10 Jan 2017 10:35:52 +0100
-Subject: [PATCH] build ping
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 3a4198e..b7de60e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -116,7 +116,7 @@ endif
- endif
-
- # -------------------------------------
--TARGETS=ping tracepath traceroute6 clockdiff rdisc arping tftpd rarpd
-+TARGETS=ping
-
- LDLIBS=$(LDLIB) $(ADDLIB)
-
---
-2.11.0
-
diff --git a/net/iputils-ping/BUILD b/net/iputils-ping/BUILD
index 9858370c32..b5ea55b7ab 100755
--- a/net/iputils-ping/BUILD
+++ b/net/iputils-ping/BUILD
@@ -1,4 +1,4 @@
-default_build_make &&
+make CC="${CC:-cc}" TARGETS=ping &&
if is_depends_enabled $SPELL opensp ; then
make_single &&
make -C doc man &&
diff --git a/net/iputils-ping/HISTORY b/net/iputils-ping/HISTORY
index 6807ca8f5b..7acb2f0de3 100644
--- a/net/iputils-ping/HISTORY
+++ b/net/iputils-ping/HISTORY
@@ -1,3 +1,7 @@
+2021-01-21 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD: fixed to build only ping without patching
+ * 0001-build-ping.patch: removed, no longer needed
+
2018-06-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 20180629
* DEPENDS: depend on libidn2 instead of libidn
diff --git a/net/iputils-ping/PRE_BUILD b/net/iputils-ping/PRE_BUILD
index b3d7fb7e70..029e38b2ac 100755
--- a/net/iputils-ping/PRE_BUILD
+++ b/net/iputils-ping/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SPELL_DIRECTORY/0001-build-ping.patch" &&
-
if ! is_depends_enabled $SPELL libcap; then
sed -i -e 's/USE_CAP=yes/USE_CAP=no/' Makefile
fi &&