From 525db0fe0807034d2a7bbbfb444e74a7dfbc0453 Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 7 Oct 2005 17:05:47 +0000 Subject: rename toolchain/libmissing to libnotimpl (fix dnsiff build) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2065 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/libvorbis/Makefile | 4 ++-- openwrt/toolchain/libmissing/Makefile | 30 -------------------------- openwrt/toolchain/libmissing/files/math.c | 35 ------------------------------- openwrt/toolchain/libnotimpl/Makefile | 30 ++++++++++++++++++++++++++ openwrt/toolchain/libnotimpl/files/math.c | 35 +++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 openwrt/toolchain/libmissing/Makefile delete mode 100644 openwrt/toolchain/libmissing/files/math.c create mode 100644 openwrt/toolchain/libnotimpl/Makefile create mode 100644 openwrt/toolchain/libnotimpl/files/math.c diff --git a/openwrt/package/libvorbis/Makefile b/openwrt/package/libvorbis/Makefile index 1777ed8a3f..1054a7fcbb 100644 --- a/openwrt/package/libvorbis/Makefile +++ b/openwrt/package/libvorbis/Makefile @@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,LIBVORBIS,libvorbis,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -# NOTE: check ./toolchain/libmissing +# NOTE: check ./toolchain/libnotimpl # it implements those functions missing from the version of uClibc we're currently using # for libvorbis, they are cosf/sinf @@ -28,7 +28,7 @@ $(PKG_BUILD_DIR)/.configured: CFLAGS="$(strip $(TARGET_CFLAGS))" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - LIBS="-lm -logg -lmissing" \ + LIBS="-lm -logg -lnotimpl" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/openwrt/toolchain/libmissing/Makefile b/openwrt/toolchain/libmissing/Makefile deleted file mode 100644 index bd3749dfb0..0000000000 --- a/openwrt/toolchain/libmissing/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -include $(TOPDIR)/rules.mk - -LIBMISSING_DIR:=$(TOOL_BUILD_DIR)/libmissing - -LIBMISSING_SRCS+=./files/math.c -LIBMISSING_OBJS:=$(patsubst ./files/%.c,$(LIBMISSING_DIR)/%.o,$(LIBMISSING_SRCS)) - -$(LIBMISSING_DIR)/.prepared: - mkdir -p $(LIBMISSING_DIR) - touch $@ - -$(LIBMISSING_OBJS): $(LIBMISSING_DIR)/%.o : ./files/%.c - $(TARGET_CC) $(TARGET_CFLAGS) -c $< -o $@ - -$(LIBMISSING_DIR)/libmissing.a: $(LIBMISSING_OBJS) - $(TARGET_CROSS)ar rc $(LIBMISSING_DIR)/libmissing.a $(LIBMISSING_OBJS) - -$(STAGING_DIR)/usr/lib/libmissing.a: $(LIBMISSING_DIR)/libmissing.a - mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $< $@ - touch -c $@ - -source: -prepare: $(LIBMISSING_DIR)/.prepared -compile: $(LIBMISSING_DIR)/libmissing.a -install: $(STAGING_DIR)/usr/lib/libmissing.a -clean: - rm -rf \ - $(STAGING_DIR)/usr/lib/libmissing.a \ - $(LIBMISSING_DIR) \ diff --git a/openwrt/toolchain/libmissing/files/math.c b/openwrt/toolchain/libmissing/files/math.c deleted file mode 100644 index cc8a661ac5..0000000000 --- a/openwrt/toolchain/libmissing/files/math.c +++ /dev/null @@ -1,35 +0,0 @@ -/* vi: set sw=4 ts=4: */ - -/* cosf for uClibc - * - * wrapper for cos(x) - */ - -#include "math.h" - -#ifdef __STDC__ - float cosf(float x) /* wrapper cos */ -#else - float cosf(x) /* wrapper cos */ - float x; -#endif -{ - return (float) cos( (double)x ); -} - -/* sinf for uClibc - * - * wrapper for sin(x) - */ - -#include "math.h" - -#ifdef __STDC__ - float sinf(float x) /* wrapper sin */ -#else - float sinf(x) /* wrapper sin */ - float x; -#endif -{ - return (float) sin( (double)x ); -} diff --git a/openwrt/toolchain/libnotimpl/Makefile b/openwrt/toolchain/libnotimpl/Makefile new file mode 100644 index 0000000000..9ae2bf2407 --- /dev/null +++ b/openwrt/toolchain/libnotimpl/Makefile @@ -0,0 +1,30 @@ +include $(TOPDIR)/rules.mk + +LIBNOTIMPL_DIR:=$(TOOL_BUILD_DIR)/libnotimpl + +LIBNOTIMPL_SRCS+=./files/math.c +LIBNOTIMPL_OBJS:=$(patsubst ./files/%.c,$(LIBNOTIMPL_DIR)/%.o,$(LIBNOTIMPL_SRCS)) + +$(LIBNOTIMPL_DIR)/.prepared: + mkdir -p $(LIBNOTIMPL_DIR) + touch $@ + +$(LIBNOTIMPL_OBJS): $(LIBNOTIMPL_DIR)/%.o : ./files/%.c + $(TARGET_CC) $(TARGET_CFLAGS) -c $< -o $@ + +$(LIBNOTIMPL_DIR)/libnotimpl.a: $(LIBNOTIMPL_OBJS) + $(TARGET_CROSS)ar rc $(LIBNOTIMPL_DIR)/libnotimpl.a $(LIBNOTIMPL_OBJS) + +$(STAGING_DIR)/usr/lib/libnotimpl.a: $(LIBNOTIMPL_DIR)/libnotimpl.a + mkdir -p $(STAGING_DIR)/usr/lib + cp -fpR $< $@ + touch -c $@ + +source: +prepare: $(LIBNOTIMPL_DIR)/.prepared +compile: $(LIBNOTIMPL_DIR)/libnotimpl.a +install: $(STAGING_DIR)/usr/lib/libnotimpl.a +clean: + rm -rf \ + $(STAGING_DIR)/usr/lib/libnotimpl.a \ + $(LIBNOTIMPL_DIR) \ diff --git a/openwrt/toolchain/libnotimpl/files/math.c b/openwrt/toolchain/libnotimpl/files/math.c new file mode 100644 index 0000000000..cc8a661ac5 --- /dev/null +++ b/openwrt/toolchain/libnotimpl/files/math.c @@ -0,0 +1,35 @@ +/* vi: set sw=4 ts=4: */ + +/* cosf for uClibc + * + * wrapper for cos(x) + */ + +#include "math.h" + +#ifdef __STDC__ + float cosf(float x) /* wrapper cos */ +#else + float cosf(x) /* wrapper cos */ + float x; +#endif +{ + return (float) cos( (double)x ); +} + +/* sinf for uClibc + * + * wrapper for sin(x) + */ + +#include "math.h" + +#ifdef __STDC__ + float sinf(float x) /* wrapper sin */ +#else + float sinf(x) /* wrapper sin */ + float x; +#endif +{ + return (float) sin( (double)x ); +} -- cgit v1.2.3