From 4e505ae59020220eded0d660dc0dd962099a08ff Mon Sep 17 00:00:00 2001
From: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu, 24 Jun 2021 15:14:19 +0200
Subject: [PATCH] util-macros: remove this package from IPFire
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

- util-macros was originally installed as a build requirement for pciaccess which is
   a dependency of libvirt
- Along the way of updates of pciaccess the build requirement for util-macros is no
   longer needed. pciaccess built without problems with util-macros removed.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Acked-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/common/util-macros |  4 --
 lfs/util-macros                     | 83 -----------------------------
 make.sh                             |  1 -
 3 files changed, 88 deletions(-)
 delete mode 100644 config/rootfiles/common/util-macros
 delete mode 100644 lfs/util-macros

diff --git a/config/rootfiles/common/util-macros b/config/rootfiles/common/util-macros
deleted file mode 100644
index 1858667b3..000000000
--- a/config/rootfiles/common/util-macros
+++ /dev/null
@@ -1,4 +0,0 @@
-#usr/share/aclocal/xorg-macros.m4
-#usr/share/pkgconfig/xorg-macros.pc
-#usr/share/util-macros
-#usr/share/util-macros/INSTALL
diff --git a/lfs/util-macros b/lfs/util-macros
deleted file mode 100644
index 90a4ac135..000000000
--- a/lfs/util-macros
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.19.0
-
-THISAPP    = util-macros-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = util-macros
-PAK_VER    = 1
-
-DEPS       =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 40e1caa49a71a26e0aa68ddd00203717
-
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist:.
-	$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 6a7f2db66..7568ee232 100755
--- a/make.sh
+++ b/make.sh
@@ -1566,7 +1566,6 @@ buildipfire() {
   lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
-  lfsmake2 util-macros
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
-- 
2.39.2