remove "-fno-rtti" c++ compiler flag preventing dynamic_cast use (closes: #3731)

[openwrt/svn-archive/archive.git] / libs / libtorrent / Makefile

diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile
index 6ace2b21a90f2fec1c1d42e3a73db034f2930e0d..2bc9f7101f16c8c06ad9f0564bf8e731dec69c0a 100644 (file)
--- a/libs/libtorrent/Makefile
+++ b/libs/libtorrent/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,14 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtorrent
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtorrent

-PKG_VERSION:=0.11.7
-PKG_RELEASE:=1
+PKG_VERSION:=0.11.9
+PKG_RELEASE:=3

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads/

-PKG_MD5SUM:=86cdfca2d1c3cfb3b6b316d9beaa25e0
-
-PKG_BUILD_DEPENDS:=libtool
+PKG_MD5SUM:=8974dc9499b382a09fb952cabcfef9a0

 
 PKG_FIXUP = libtool
 
 
 PKG_FIXUP = libtool
 


@@ -27,7 +25,7 @@ define Package/libtorrent
   CATEGORY:=Libraries
   TITLE:=Rakshasa's BitTorrent library
   URL:=http://libtorrent.rakshasa.no/
   CATEGORY:=Libraries
   TITLE:=Rakshasa's BitTorrent library
   URL:=http://libtorrent.rakshasa.no/

-  DEPENDS:=+libsigcxx
+  DEPENDS:=+libopenssl +libsigcxx

 endef
 
 define Package/libtorrent/description
 endef
 
 define Package/libtorrent/description


@@ -38,38 +36,27 @@ define Package/libtorrent/description
  the speed of the official client.
 endef
 
  the speed of the official client.
 endef
 

+# XXX: rtorrent needs encryption (--enable-openssl)

 CONFIGURE_ARGS+= \
        --enable-shared \
        --enable-static \
        --enable-aligned \
        --disable-debug \
 CONFIGURE_ARGS+= \
        --enable-shared \
        --enable-static \
        --enable-aligned \
        --disable-debug \

-       --disable-openssl \
-
-CONFIGURE_VARS += \
-       CXX="g++-uc+std" \
-       CXXFLAGS="$$$$CXXFLAGS -fno-rtti"  \
-
-define Build/Configure
-       $(call Build/Configure/Default,)
-       $(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib"|g' \
-               $(PKG_BUILD_DIR)/libtool
-       $(SED) 's|^postdeps=.*|postdeps=|g' $(PKG_BUILD_DIR)/libtool
-endef
+       --enable-openssl \

 
 define Build/Compile
 
 define Build/Compile

-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include

        $(CP) $(PKG_INSTALL_DIR)/usr/include/torrent $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/torrent $(1)/usr/include/

-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(1)/usr/lib/

-       mkdir -p $(1)/usr/lib/pkgconfig
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(1)/usr/lib/pkgconfig/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(1)/usr/lib/pkgconfig/

-       $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/libtorrent.pc

 endef
 
 define Package/libtorrent/install
 endef
 
 define Package/libtorrent/install