From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 10 Apr 2007 22:51:12 +0000 (+0000)
Subject: remove the need for C99 math (closes: #1579)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a45501ffdb7686552ce21c0edee9e144efedbaf4;p=openwrt%2Fsvn-archive%2Farchive.git

remove the need for C99 math (closes: #1579)


SVN-Revision: 6929
---

diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index 30103610ee..77f5238255 100644
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -20,6 +20,8 @@ PKG_SOURCE_URL:=\
 PKG_MD5SUM:=cb47771004d53505200ffd00ac45bc32
 PKG_CAT:=bzcat
 
+PKG_BUILD_DEPENDS:=libnotimpl
+
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -45,7 +47,7 @@ endef
 define Package/pgsql-server
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libpq @C99_MATH
+  DEPENDS:=+libpq
   TITLE:=PostgreSQL databases Server
   DESCRIPTION:=PostgreSQL databases Server.
   URL:=http://www.postgresql.org/
@@ -96,8 +98,9 @@ define Build/Configure
 	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$$$$CPPFLAGS $(EXTRA_CPPFLAGS)" \
-		LDFLAGS="$(EXTRA_LDFLAGS)" \
+		CPPFLAGS="$$$$CPPFLAGS $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		LIBS="-lnotimpl" \
 		./configure \
 			--target=$(GNU_TARGET_NAME) \
 			--host=$(GNU_TARGET_NAME) \
diff --git a/libs/postgresql/patches/850-uclibc_no_cbrt.patch b/libs/postgresql/patches/850-uclibc_no_cbrt.patch
new file mode 100644
index 0000000000..3be656cc69
--- /dev/null
+++ b/libs/postgresql/patches/850-uclibc_no_cbrt.patch
@@ -0,0 +1,23 @@
+diff -ruN postgresql-8.2.3-old/src/backend/utils/adt/float.c postgresql-8.2.3-new/src/backend/utils/adt/float.c
+--- postgresql-8.2.3-old/src/backend/utils/adt/float.c	2006-10-05 03:40:45.000000000 +0200
++++ postgresql-8.2.3-new/src/backend/utils/adt/float.c	2007-04-10 23:13:16.000000000 +0200
+@@ -110,7 +110,9 @@
+ static int	float8_cmp_internal(float8 a, float8 b);
+ 
+ #ifndef HAVE_CBRT
+-static double cbrt(double x);
++#undef cbrt
++#define cbrt(x) pg_cbrt(x)
++static double pg_cbrt(double x);
+ #endif   /* HAVE_CBRT */
+ 
+ 
+@@ -2831,7 +2833,7 @@
+ #ifndef HAVE_CBRT
+ 
+ static double
+-cbrt(double x)
++pg_cbrt(double x)
+ {
+ 	int			isneg = (x < 0.0);
+ 	double		absx = fabs(x);