From ed5ef208501e9f18ee309af72d05eb8eb3811d16 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 17 Feb 2021 16:18:30 +0000 Subject: [PATCH] gmp-compat: Drop package This is no longer required because everything should be linked against the current version. Signed-off-by: Michael Tremer --- config/rootfiles/common/gmp-compat | 2 - config/rootfiles/core/155/update.sh | 2 + lfs/gmp-compat | 84 ----------------------------- make.sh | 1 - 4 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 config/rootfiles/common/gmp-compat delete mode 100644 lfs/gmp-compat diff --git a/config/rootfiles/common/gmp-compat b/config/rootfiles/common/gmp-compat deleted file mode 100644 index a4b82f25c4..0000000000 --- a/config/rootfiles/common/gmp-compat +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libgmp.so.3 -usr/lib/libgmp.so.3.5.2 diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index 0f5d378482..81144f0a7c 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -35,6 +35,8 @@ done rm -vrf \ /usr/lib/sse2 \ /usr/local/lib/sse2 \ + /usr/lib/libgmp.so.3 \ + /usr/lib/libgmp.so.3.5.2 \ /lib/libpcre.so.0 \ /lib/libpcre.so.0.0.1 diff --git a/lfs/gmp-compat b/lfs/gmp-compat deleted file mode 100644 index ef2d56b0a5..0000000000 --- a/lfs/gmp-compat +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 4.3.2 - -THISAPP = gmp-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -ifeq "$(BUILD_ARCH)" "i586" - CONFIGURE_ARGS = ABI=32 -endif - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = dd60683d7057917e34630b4a787932e8 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# 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 jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ - --build=$(BUILDTARGET) \ - --enable-cxx --enable-mpbsd --disable-nls - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && install -m 644 .libs/libgmp.so.3.5.2 /usr/lib - ln -svf libgmp.so.3.5.2 /usr/lib/libgmp.so.3 - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index eb00087f69..25929605a3 100755 --- a/make.sh +++ b/make.sh @@ -1080,7 +1080,6 @@ buildbase() { lfsmake2 libtool lfsmake2 binutils lfsmake2 gmp - lfsmake2 gmp-compat lfsmake2 mpfr lfsmake2 libmpc lfsmake2 libxcrypt -- 2.39.5