From accbd71154b8815678baa12f21f853ed8478f400 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Dec 2010 22:53:58 +0100 Subject: [PATCH] libfloat: remove package This package has been marked deprecated in Buildroot last year, no-one complained, and it isn't developed upstream anymore. So get rid of it. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- package/Config.in | 1 - package/libfloat/Config.in | 8 ---- package/libfloat/libfloat.mk | 65 --------------------------------- package/libfloat/libfloat.patch | 45 ----------------------- 5 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 package/libfloat/Config.in delete mode 100644 package/libfloat/libfloat.mk delete mode 100644 package/libfloat/libfloat.patch diff --git a/CHANGES b/CHANGES index f3d82439d0..c4cf18c1c1 100644 --- a/CHANGES +++ b/CHANGES @@ -12,7 +12,7 @@ New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone - Removed packages: microcom, ng-spice-rework + Removed packages: libfloat, microcom, ng-spice-rework Issues resolved (http://bugs.uclibc.org): diff --git a/package/Config.in b/package/Config.in index eb4ea8e76d..0f3eca4699 100644 --- a/package/Config.in +++ b/package/Config.in @@ -323,7 +323,6 @@ source "package/libcap/Config.in" source "package/libdaemon/Config.in" source "package/libelf/Config.in" source "package/libevent/Config.in" -source "package/libfloat/Config.in" source "package/libglib2/Config.in" source "package/liboil/Config.in" source "package/startup-notification/Config.in" diff --git a/package/libfloat/Config.in b/package/libfloat/Config.in deleted file mode 100644 index 3df933454b..0000000000 --- a/package/libfloat/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBFLOAT - bool "libfloat" - depends on BR2_DEPRECATED - help - Soft floating point library. - - http://netwinder.osuosl.org/devteam/scottb/libfloat/ - diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk deleted file mode 100644 index 0c4ae28332..0000000000 --- a/package/libfloat/libfloat.mk +++ /dev/null @@ -1,65 +0,0 @@ -############################################################# -# -# libfloat -# -############################################################# -LIBFLOAT_SOURCE:=libfloat_990616.orig.tar.gz -LIBFLOAT_PATCH:=libfloat_990616-3.diff.gz -LIBFLOAT_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/libf/libfloat -LIBFLOAT_CAT:=$(ZCAT) -LIBFLOAT_DIR:=$(BUILD_DIR)/libfloat - -LIBFLOAT_TARGET= -ifeq ($(strip $(SOFT_FLOAT)),true) -ifeq ("$(strip $(ARCH))","arm") -ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) -LIBFLOAT_TARGET+=$(STAGING_DIR)/lib/libfloat.so -endif -endif -endif - -$(DL_DIR)/$(LIBFLOAT_SOURCE): - $(call DOWNLOAD,$(LIBFLOAT_SITE),$(LIBFLOAT_SOURCE)) - -$(DL_DIR)/$(LIBFLOAT_PATCH): - $(call DOWNLOAD,$(LIBFLOAT_SITE),$(LIBFLOAT_PATCH)) - -libfloat-source: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PATCH) - -$(LIBFLOAT_DIR)/.unpacked: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PATCH) - $(LIBFLOAT_CAT) $(DL_DIR)/$(LIBFLOAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - # Remove the binary files distributed with the the package. - -$(MAKE) -C $(LIBFLOAT_DIR) clean - toolchain/patch-kernel.sh $(LIBFLOAT_DIR) $(DL_DIR) $(LIBFLOAT_PATCH) - toolchain/patch-kernel.sh $(LIBFLOAT_DIR) package/libfloat/ libfloat\*.patch - touch $@ - -$(LIBFLOAT_DIR)/libfloat.so.1: $(LIBFLOAT_DIR)/.unpacked - $(MAKE) CC="$(TARGET_CC)" LD=$(TARGET_CROSS)ld -C $(LIBFLOAT_DIR) - -$(STAGING_DIR)/lib/libfloat.so $(STAGING_DIR)/lib/libfloat.a: $(LIBFLOAT_DIR)/libfloat.so.1 - cp -dpf $(LIBFLOAT_DIR)/libfloat.a $(STAGING_DIR)/lib/libfloat.a - cp -dpf $(LIBFLOAT_DIR)/libfloat.so.1 $(STAGING_DIR)/lib/libfloat.so.1 - (cd $(STAGING_DIR)/lib; ln -snf libfloat.so.1 libfloat.so) - cp -dpf $(LIBFLOAT_DIR)/libfloat.a $(TARGET_DIR)/usr/lib/libfloat.a - cp -dpf $(LIBFLOAT_DIR)/libfloat.so.1 $(TARGET_DIR)/lib/libfloat.so.1 - $(STRIPCMD) $(TARGET_DIR)/lib/libfloat.so.1 > /dev/null 2>&1 - (cd $(TARGET_DIR)/lib; ln -snf libfloat.so.1 libfloat.so) - (cd $(TARGET_DIR)/usr/lib; ln -snf /lib/libfloat.so libfloat.so) - -libfloat: $(gcc_initial) $(STAGING_DIR)/lib/libfloat.so - -libfloat-clean: - -$(MAKE) -C $(LIBFLOAT_DIR) clean - -libfloat-dirclean: - rm -rf $(LIBFLOAT_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -#ifeq ($(BR2_PACKAGE_LIBFLOAT),y) -#TARGETS+=libfloat -#endif diff --git a/package/libfloat/libfloat.patch b/package/libfloat/libfloat.patch deleted file mode 100644 index 90459a89e6..0000000000 --- a/package/libfloat/libfloat.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -urN libfloat-dist/Makefile libfloat/Makefile ---- libfloat-dist/Makefile 2003-10-26 00:33:45.000000000 -0500 -+++ libfloat/Makefile 2003-10-26 01:07:26.000000000 -0500 -@@ -1,7 +1,7 @@ - # Makefile for the Linux soft-float library - --CC=gcc -O2 -freg-struct-return -fomit-frame-pointer -D__LIBFLOAT__ --#CC=gcc -g -O2 -freg-struct-return -D__LIBFLOAT__ -+CFLAGS= -O2 -freg-struct-return -fomit-frame-pointer -D__LIBFLOAT__ -msoft-float -+LIBGCC=$(shell $(CC) -print-libgcc-file-name) - AR=ar - - all: libfloat.a libfloat.so.1 -@@ -12,24 +11,24 @@ - - libfloat.so.1: softfloat.os fplib_glue.os - rm -f libfloat.so.1 -- gcc -shared -Wl,-soname,libfloat.so.1 softfloat.os fplib_glue.os -o libfloat.so.1 -+ $(LD) -shared -soname=libfloat.so.1 softfloat.os fplib_glue.os -o libfloat.so.1 $(LIBGCC) - - softfloat.o: softfloat/bits64/softfloat.c -- $(CC) -c -o softfloat.o -Isoftfloat/bits64/ARM-gcc softfloat/bits64/softfloat.c -+ $(CC) $(CFLAGS) -c -o softfloat.o -Isoftfloat/bits64/ARM-gcc softfloat/bits64/softfloat.c - - fplib_glue.o: fplib_glue.S -- $(CC) -c -o fplib_glue.o fplib_glue.S -+ $(CC) $(CFLAGS) -c -o fplib_glue.o fplib_glue.S - - softfloat.os: softfloat/bits64/softfloat.c -- $(CC) -fpic -c -o softfloat.os -Isoftfloat/bits64/ARM-gcc softfloat/bits64/softfloat.c -+ $(CC) $(CFLAGS) -fpic -c -o softfloat.os -Isoftfloat/bits64/ARM-gcc softfloat/bits64/softfloat.c - - fplib_glue.os: fplib_glue.S -- $(CC) -fpic -c -o fplib_glue.os fplib_glue.S -+ $(CC) $(CFLAGS) -fpic -c -o fplib_glue.os fplib_glue.S - - install: libfloat.a libfloat.so.1 - cp -a libfloat.a $(DESTDIR)/usr/lib -- cp -a libfloat.so.1 $(DESTDIR)/usr/lib -- cd $(DESTDIR)/usr/lib; ln -s libfloat.so.1 libfloat.so -+ cp -a libfloat.so.1 $(DESTDIR)/lib -+ cd $(DESTDIR)/lib; ln -s libfloat.so.1 libfloat.so - #ldconfig - - clean: -- 2.30.2