From 6edd53dbeed3c9629ac3175b81f5d3e27548010c Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 27 Apr 2009 21:04:45 +0000 Subject: [PATCH] [packages] remove libnotimpl, missing math functions are provided by uClibc since r10024 git-svn-id: svn://svn.openwrt.org/openwrt/packages@15454 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ipv6/mrd6/Makefile | 4 +- libs/libnotimpl/Makefile | 48 ----------------- libs/libnotimpl/src/math.c | 128 --------------------------------------------- libs/liboil/Makefile | 1 - libs/postgresql/Makefile | 7 +-- libs/speex/Makefile | 6 +-- net/kismet/Makefile | 4 +- net/nagios/Makefile | 5 -- net/qolyester/Makefile | 3 -- sound/sox/Makefile | 3 -- utils/rrdtool/Makefile | 6 +-- 11 files changed, 9 insertions(+), 206 deletions(-) delete mode 100644 libs/libnotimpl/Makefile delete mode 100644 libs/libnotimpl/src/math.c diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile index 4d2459dd2..0bd3f4403 100644 --- a/ipv6/mrd6/Makefile +++ b/ipv6/mrd6/Makefile @@ -17,8 +17,6 @@ PKG_SOURCE_URL:=http://fivebits.net/files/mrd6/ \ http://hng.av.it.pt/mrd6/download/ PKG_MD5SUM:=361322198dafcc5ffab5e8e23197012b -PKG_BUILD_DEPENDS:=libnotimpl - include $(INCLUDE_DIR)/package.mk define Package/mrd6 @@ -45,7 +43,7 @@ define Build/Compile SPACE_OPTIMIZE=yes \ FULL_STATIC=no \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DNO_INET6_OPTION -fno-builtin -fno-rtti" \ - LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -ldl -lgcc -lm -lnotimpl" \ + LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -ldl -lgcc -lm" \ MODULE_CXX="\$$$$(CC) -shared \$$$$(CXXFLAGS) \$$$$(LDFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ PREFIX="/usr" \ diff --git a/libs/libnotimpl/Makefile b/libs/libnotimpl/Makefile deleted file mode 100644 index c1e7b7007..000000000 --- a/libs/libnotimpl/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libnotimpl -PKG_VERSION:=1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/libnotimpl - -include $(INCLUDE_DIR)/package.mk - -define Package/libnotimpl - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Implements functions missing from uClibc -endef - -ifeq ($(ARCH),x86_64) - FPIC:=-fPIC -endif - -define cc - $(TARGET_CC) $(TARGET_CFLAGS) $(FPIC) -Wall -c src/$(1).c -o $(PKG_BUILD_DIR)/$(1).o -endef - -define Build/Prepare - rm -rf $(PKG_BUILD_DIR) - mkdir -p $(PKG_BUILD_DIR) -endef - -TARGET_CFLAGS += $(FPIC) - -define Build/Compile - $(call cc,math) - $(TARGET_CROSS)ar rc $(PKG_BUILD_DIR)/libnotimpl.a $(PKG_BUILD_DIR)/*.o -endef - -define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libnotimpl.a $(STAGING_DIR)/usr/lib/ -endef - -$(eval $(call BuildPackage,libnotimpl)) diff --git a/libs/libnotimpl/src/math.c b/libs/libnotimpl/src/math.c deleted file mode 100644 index 0cbd1b3a9..000000000 --- a/libs/libnotimpl/src/math.c +++ /dev/null @@ -1,128 +0,0 @@ -/* vi: set sw=4 ts=4: */ - -#include - - -/* cosf for uClibc - * - * wrapper for cos(x) - */ - -#ifdef __STDC__ - float cosf(float x) -#else - float cosf(x) - float x; -#endif -{ - return (float) cos( (double)x ); -} - - -/* sinf for uClibc - * - * wrapper for sin(x) - */ - -#ifdef __STDC__ - float sinf(float x) -#else - float sinf(x) - float x; -#endif -{ - return (float) sin( (double)x ); -} - - -/* ceilf for uClibc - * - * wrapper for ceil(x) - */ - -#ifdef __STDC__ - float ceilf(float x) -#else - float ceilf(x) - float x; -#endif -{ - return (float) ceil( (double)x ); -} - - -/* rintf for uClibc - * - * wrapper for rint(x) - */ - -#ifdef __STDC__ - float rintf(float x) -#else - float rintf(x) - float x; -#endif -{ - return (float) rint( (double)x ); -} - -/* logf for uClibc - * - * wrapper for logf(x) - */ - -#ifdef __STDC__ - float logf(float x) -#else - float logf(x) - float x; -#endif -{ - return (float) logf( (double)x ); -} - -/* expf for uClibc - * - * wrapper for expf(x) - */ - -#ifdef __STDC__ - float expf(float x) -#else - float expf(x) - float x; -#endif -{ - return (float) expf( (double)x ); -} - -/* lround for uClibc - * - * wrapper for lround(x) - */ - -#ifdef __STDC__ - long lround(double x) -#else - long lround(x) - double x; -#endif -{ - return (long) ((x - ((long)x) >= 0.5f) ? (((long)x) + 1) : ((long)x)); -} - -/* lround for uClibc - * - * wrapper for roundf(x) - */ - -#ifdef __STDC__ - float roundf(float x) -#else - float roundf(x) - float x; -#endif -{ - return (float) ((x - ((long)x) >= 0.5f) ? (((long)x) + 1) : ((long)x)); -} - diff --git a/libs/liboil/Makefile b/libs/liboil/Makefile index 7b19966e0..8c0695569 100644 --- a/libs/liboil/Makefile +++ b/libs/liboil/Makefile @@ -15,7 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/ PKG_MD5SUM:=11dd39b1ca13ce2e0618d4df8303f137 -PKG_BUILD_DEPENDS:=libnotimpl PKG_FIXUP = libtool include $(INCLUDE_DIR)/package.mk diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 68a74842f..aa7d800e8 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql PKG_VERSION:=8.3.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=\ @@ -20,8 +20,6 @@ PKG_SOURCE_URL:=\ ftp://ftp-archives.postgresql.org/pub/source/v$(PKG_VERSION) PKG_MD5SUM:=0ae4bd9620e84d3e08dcf923808d14d0 -PKG_BUILD_DEPENDS:=libnotimpl - include $(INCLUDE_DIR)/package.mk define Package/libpq @@ -114,7 +112,6 @@ define Build/Configure CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="$$$$CPPFLAGS $(TARGET_CPPFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ - LIBS="-lnotimpl" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/libs/speex/Makefile b/libs/speex/Makefile index b8a5f4314..f75507aeb 100644 --- a/libs/speex/Makefile +++ b/libs/speex/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/speex/ PKG_MD5SUM:=b47396952c5fdd54b6468316c3bd339f -PKG_BUILD_DEPENDS:=libnotimpl - include $(INCLUDE_DIR)/package.mk define Package/libspeex @@ -59,8 +57,6 @@ define Package/libspeexdsp/description This package contains the shared dsp library, needed by other programs. endef -TARGET_LDFLAGS:=$(TARGET_LDFLAGS) -lnotimpl - define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ diff --git a/net/kismet/Makefile b/net/kismet/Makefile index 158ec7bee..9e6675d06 100644 --- a/net/kismet/Makefile +++ b/net/kismet/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.kismetwireless.net/code PKG_MD5SUM:=6ee365d36354b4dee4945e67f8149294 -PKG_BUILD_DEPENDS:=libnotimpl libpcap libncurses uclibcxx +PKG_BUILD_DEPENDS:=libpcap libncurses uclibcxx include $(INCLUDE_DIR)/package.mk @@ -95,7 +95,7 @@ CONFIGURE_VARS += \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \ LDFLAGS="$$$$LDFLAGS" \ - LIBS="-nodefaultlibs -luClibc++ -lm -lnotimpl -lgcc" \ + LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ diff --git a/net/nagios/Makefile b/net/nagios/Makefile index 989a96683..f64b0062a 100644 --- a/net/nagios/Makefile +++ b/net/nagios/Makefile @@ -19,8 +19,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -PKG_BUILD_DEPENDS:=libnotimpl - define Package/nagios SECTION:=net CATEGORY:=Network @@ -44,9 +42,6 @@ CONFIGURE_ARGS += \ --without-gd-inc \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" -CONFIGURE_VARS += \ - LIBS="-lnotimpl" - define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ diff --git a/net/qolyester/Makefile b/net/qolyester/Makefile index e6079336b..212985dc0 100644 --- a/net/qolyester/Makefile +++ b/net/qolyester/Makefile @@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://qolsr.lri.fr/code/ PKG_MD5SUM:=650286fc2ea3e13c246d233aaa46f2a4 -PKG_BUILD_DEPENDS:=libnotimpl - include $(INCLUDE_DIR)/package.mk define Package/qolyester @@ -37,7 +35,6 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - LIBS="-L$(STAGING_DIR)/usr/lib -lnotimpl" \ all install endef diff --git a/sound/sox/Makefile b/sound/sox/Makefile index 46f9db801..27c12fe06 100644 --- a/sound/sox/Makefile +++ b/sound/sox/Makefile @@ -17,7 +17,6 @@ PKG_SOURCE_URL:=@SF/sox PKG_MD5SUM:=6c95af60b20b9655531bf3162c0be937 PKG_FIXUP = libtool -PKG_BUILD_DEPENDS:=libnotimpl include $(INCLUDE_DIR)/package.mk @@ -44,8 +43,6 @@ define Build/Configure --disable-external-gsm \ --without-libltdl \ --with-ogg \ - , \ - LIBS="-lnotimpl -lm" \ ) endef diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile index 4a93970f5..bf5b12cd5 100644 --- a/utils/rrdtool/Makefile +++ b/utils/rrdtool/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,7 +15,8 @@ PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb -PKG_BUILD_DEPENDS:=python libnotimpl +PKG_BUILD_DEPENDS:=python + PKG_FIXUP = libtool include $(INCLUDE_DIR)/package.mk @@ -69,7 +70,6 @@ CONFIGURE_ARGS += \ --with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \ CONFIGURE_VARS += \ - LIBS="-lnotimpl" \ rd_cv_ieee_works=yes \ rd_cv_null_realloc=nope \ ac_cv_func_mmap_fixed_mapped=yes \ -- 2.11.0