Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e9233522f0f3f54b28b23a719c37151e821d536c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e9233522f0f3f54b28b23a719c37151e821d536c)
  • Date: Thu, 18 Oct 2018 17:51:16 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/iproute2/DEPENDS | 10 +++++++---
net/iproute2/HISTORY | 6 ++++++
net/iproute2/PRE_BUILD | 27 +++++++++++++++++++++++++++
net/iproute2/TRIGGERS | 4 +++-
4 files changed, 43 insertions(+), 4 deletions(-)

New commits:
commit e9233522f0f3f54b28b23a719c37151e821d536c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

iproute2: correct dependency detection

diff --git a/net/iproute2/DEPENDS b/net/iproute2/DEPENDS
index 8a4f089..34654fb 100755
--- a/net/iproute2/DEPENDS
+++ b/net/iproute2/DEPENDS
@@ -1,6 +1,7 @@
-depends flex &&
-depends bison &&
-depends libnl &&
+depends flex &&
+depends bison &&
+depends libnl &&
+depends pkgconfig &&

if [ "$BUILD_DOCS" == "y" ]; then
depends linuxdoc-tools &&
@@ -8,6 +9,9 @@ if [ "$BUILD_DOCS" == "y" ]; then
depends texlive
fi &&

+optional_depends LIBELF "" "" "for ELF library support" &&
+optional_depends libmnl "" "" "for libmnl support" &&
+optional_depends ipset "" "" "for ipset support" &&
optional_depends iptables "" "" "for ipt/xt module" &&
optional_depends libselinux "" "" "for SELinux support" &&

diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 4e635a3..44dea42 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,9 @@
+2018-10-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added pkgconfig required and LIBELF, libmnl, ipset optional
+ dependencies
+ * PRE_BUILD: re-added, to fix dependency relationships
+ * TRIGGERS: added iptables dependency condition
+
2018-06-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 4.17.0

diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
new file mode 100755
index 0000000..d2b9312
--- /dev/null
+++ b/net/iproute2/PRE_BUILD
@@ -0,0 +1,27 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} LIBELF); then
+ sedit "s:libelf --:nolibelf --:" configure
+fi &&
+
+if ! is_depends_enabled ${SPELL} libselinux; then
+ sedit "s:libselinux --:nolibselinux --:" configure
+fi &&
+
+if ! is_depends_enabled ${SPELL} libmnl; then
+ sedit "s:libmnl --: nolibmnl --:" configure
+fi &&
+
+if ! is_depends_enabled ${SPELL} ipset; then
+ sedit "/ip_set\.h/d" configure
+fi &&
+
+if ! is_depends_enabled ${SPELL} iptables; then
+ sedit "/xtables\.h/d" configure &&
+ sedit "s:xtables --:noxtables --:" configure
+fi &&
+
+if ! is_depends_enabled ${SPELL} db; then
+ sedit "/db_185\.h/d" configure
+fi
diff --git a/net/iproute2/TRIGGERS b/net/iproute2/TRIGGERS
index b7df18a..dd880df 100755
--- a/net/iproute2/TRIGGERS
+++ b/net/iproute2/TRIGGERS
@@ -1 +1,3 @@
-on_cast iptables check_self
+if is_depends_enabled $SPELL iptables; then
+ on_cast iptables check_self
+fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e9233522f0f3f54b28b23a719c37151e821d536c), Vlad Glagolev, 10/18/2018

Archive powered by MHonArc 2.6.24.

Top of Page