Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a0a616142375399970d09e781664f996506d6614)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a0a616142375399970d09e781664f996506d6614)
  • Date: Thu, 21 Jan 2021 18:13:03 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

net/iputils-ping/0001-build-ping.patch | 25 -------------------------
net/iputils-ping/BUILD | 7 ++++++-
net/iputils-ping/HISTORY | 6 ++++++
net/iputils-ping/PRE_BUILD | 4 ++--
4 files changed, 14 insertions(+), 28 deletions(-)

New commits:
commit a0a616142375399970d09e781664f996506d6614
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

iputils-ping: Fix building against musl

commit 7958b281cd371dc29a89e66aa1af46e88a0f8b12
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

iputils-ping: Fix duplicated variable definition

Fix the duplicated definition of "device" at ping6_common.c by making it
extern.

commit 73b4a714461543c8dee513aa2f5f60a798fec274
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

iputils-ping: Replace patch to the Makefile with parameter

diff --git a/net/iputils-ping/0001-build-ping.patch
b/net/iputils-ping/0001-build-ping.patch
deleted file mode 100644
index 6a5085e..0000000
--- 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 AT 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 9858370..5c63e22 100755
--- a/net/iputils-ping/BUILD
+++ b/net/iputils-ping/BUILD
@@ -1,4 +1,9 @@
-default_build_make &&
+case "$HOST" in
+ (*-musl)
+ CFLAGS+=' -DAI_CANONIDN=0'
+ ;;
+esac &&
+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 6807ca8..d9ca0f1 100644
--- a/net/iputils-ping/HISTORY
+++ b/net/iputils-ping/HISTORY
@@ -1,3 +1,9 @@
+2021-01-21 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: fixed to build only ping without patching
+ * 0001-build-ping.patch: removed, no longer needed
+ * PRE_BUILD: fixed duplicated variable definition
+ * BUILD: fixed build against musl
+
2018-06-30 Florian Franzmann <siflfran AT 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 b3d7fb7..889fae4 100755
--- a/net/iputils-ping/PRE_BUILD
+++ b/net/iputils-ping/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/0001-build-ping.patch" &&
+# fix duplicated definition
+sedit 's/^char \*device;$/extern &/' ping6_common.c &&

if ! is_depends_enabled $SPELL libcap; then
sed -i -e 's/USE_CAP=yes/USE_CAP=no/' Makefile



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a0a616142375399970d09e781664f996506d6614), Ismael Luceno, 01/21/2021

Archive powered by MHonArc 2.6.24.

Top of Page