From c80f82aa18a6295524dce1d13d1c8105b5fa4676 Mon Sep 17 00:00:00 2001
From: Ismael Luceno
Date: Sat, 5 Jun 2021 15:05:01 +0200
Subject: ifupdown-ng: Avoid libbsd on musl

Fixes: 8b57b917a1d9 ("net/ifupdown-ng: version 0.11.3")
---
 net/ifupdown-ng/BUILD                              | 11 ++++++++-
 net/ifupdown-ng/DEPENDS                            |  8 +++++--
 net/ifupdown-ng/DETAILS                            |  1 +
 net/ifupdown-ng/HISTORY                            |  6 +++++
 net/ifupdown-ng/PRE_BUILD                          |  4 ----
 .../patches/0001-Fix-linking-against-libbsd.patch  | 26 ----------------------
 6 files changed, 23 insertions(+), 33 deletions(-)
 delete mode 100755 net/ifupdown-ng/PRE_BUILD
 delete mode 100644 net/ifupdown-ng/patches/0001-Fix-linking-against-libbsd.patch

(limited to 'net')

diff --git a/net/ifupdown-ng/BUILD b/net/ifupdown-ng/BUILD
index 6dfecc1f8a..4a20f0d478 100755
--- a/net/ifupdown-ng/BUILD
+++ b/net/ifupdown-ng/BUILD
@@ -1 +1,10 @@
-default_build_make
+unset LIBBSD_CFLAGS LIBBSD_LIBS &&
+if is_depends_enabled "$SPELL" libbsd; then
+  LIBBSD_CFLAGS=$(pkg-config --cflags libbsd-overlay) &&
+  LIBBSD_LIBS=$(pkg-config --libs libbsd-overlay)
+fi &&
+make \
+  CC="${CC:-cc}" \
+  HOSTCC="${HOSTCC:-${CC:-cc}}" \
+  LIBBSD_CFLAGS="$LIBBSD_CFLAGS" \
+  LIBBSD_LIBS="$LIBBSD_LIBS"
diff --git a/net/ifupdown-ng/DEPENDS b/net/ifupdown-ng/DEPENDS
index d331559e19..fc49cf8e90 100755
--- a/net/ifupdown-ng/DEPENDS
+++ b/net/ifupdown-ng/DEPENDS
@@ -1,5 +1,9 @@
 depends iproute2 &&
-depends libbsd   &&
-
+case "$HOST" in
+  (*-gnu)
+    depends pkgconfig &&
+    depends libbsd
+    ;;
+esac &&
 optional_depends dhcpcd '' '' 'for DHCP support' &&
 optional_depends wpa_supplicant '' '' 'for 802.11i (WPA/2/3) support'
diff --git a/net/ifupdown-ng/DETAILS b/net/ifupdown-ng/DETAILS
index e41e8942d4..1685ded76e 100755
--- a/net/ifupdown-ng/DETAILS
+++ b/net/ifupdown-ng/DETAILS
@@ -1,5 +1,6 @@
            SPELL=ifupdown-ng
          VERSION=0.11.3
+      PATCHLEVEL=1
           SOURCE="$SPELL-$VERSION.tar.gz"
    SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/archive/refs/tags/$SOURCE
      SOURCE_HASH=sha512:d6c1f9304dab3eba986b290cf5f4ec39b0c459337c20a7feaeb67a9bb4107384286046b5fb23bfabe8e4594debf45184b04ff9477dad7f59af37e14ebd9fe650
diff --git a/net/ifupdown-ng/HISTORY b/net/ifupdown-ng/HISTORY
index 43e339dbfa..2c0d4f9386 100644
--- a/net/ifupdown-ng/HISTORY
+++ b/net/ifupdown-ng/HISTORY
@@ -1,3 +1,9 @@
+2021-06-05 Ismael Luceno <ismael@sourcemage.org>
+	* DEPENDS, BUILD: avoid libbsd on musl
+	* PRE_BUILD, patches/0001-Fix-linking-against-libbsd.patch:
+	  removed, no longer needed
+	* DETAILS: PATCHLEVEL++
+
 2021-06-04  Florian Franzmann  <bwlf@bandrate.org>
 	* DETAILS: version 0.11.3
 	* PRE_BUILD, patches/0001-Fix-linking-against-libbsd.patch: fix linking
diff --git a/net/ifupdown-ng/PRE_BUILD b/net/ifupdown-ng/PRE_BUILD
deleted file mode 100755
index 335732967a..0000000000
--- a/net/ifupdown-ng/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build      &&
-cd "$SOURCE_DIRECTORY" &&
-
-apply_patch_dir patches
diff --git a/net/ifupdown-ng/patches/0001-Fix-linking-against-libbsd.patch b/net/ifupdown-ng/patches/0001-Fix-linking-against-libbsd.patch
deleted file mode 100644
index ad521cde5b..0000000000
--- a/net/ifupdown-ng/patches/0001-Fix-linking-against-libbsd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9eb068527c1f7d43ff2a3e335509bc533d0c1d5d Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf@bandrate.org>
-Date: Fri, 4 Jun 2021 13:42:18 +0200
-Subject: [PATCH] Fix linking against libbsd
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 5b41f7e..f99ba66 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- LAYOUT ?= linux
- SCDOC := scdoc
--LIBBSD_CFLAGS =
--LIBBSD_LIBS =
-+LIBBSD_CFLAGS := $(shell pkg-config --cflags libbsd-overlay)
-+LIBBSD_LIBS := $(shell pkg-config --libs libbsd-overlay)
- 
- PACKAGE_NAME := ifupdown-ng
- PACKAGE_VERSION := 0.11.3
--- 
-2.31.1
-
-- 
cgit v1.2.3