From 7a0ee192389b94c59b2050949498f032bbd8c229 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 14 Jun 2012 20:26:28 +0000
Subject: [PATCH] xmail: use uclibc++.mk

git-svn-id: svn://svn.openwrt.org/openwrt/packages@32375 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 mail/xmail/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index fa4488cb8..7ff16fbf4 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -15,12 +15,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.xmailserver.org/
 PKG_MD5SUM:=26d35c2fc104d79ebb6397c7dece5b15
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/xmail
   SECTION:=mail
   CATEGORY:=Mail
-  DEPENDS:=+uclibcxx +libopenssl +libpthread
+  DEPENDS:=+libopenssl +libpthread $(CXX_DEPENDS)
   TITLE:=advanced, fast and reliable ESMTP/POP3 mail server
   URL:=http://www.xmailserver.org/
 endef
@@ -35,9 +36,7 @@ define Build/Compile
 	CFLAGS="$(TARGET_CFLAGS)" \
 	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.lnx \
 		$(TARGET_CONFIGURE_OPTS) \
-		LD="\$$$$(CC)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \
-		LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lc -lcrypto -lssl -luClibc++ -ldl -lm -lpthread $(LIBGCC_S)" \
+		LD="$(TARGET_CXX)" \
 		all
 	tar -cjf $(PKG_BUILD_DIR)/MailRoot.tar.bz2 -C $(PKG_BUILD_DIR)/MailRoot --exclude bin .
 endef