24698577 Adjust rtorrent Makefile when new libtorrent available on build machines
authorRich Burridge <rich.burridge@oracle.com>
Fri, 07 Oct 2016 05:45:06 -0700
changeset 7075 a25f861f02f5
parent 7074 932d173cefb1
child 7077 85015b85a5e9
24698577 Adjust rtorrent Makefile when new libtorrent available on build machines
components/rtorrent/Makefile
components/rtorrent/depend.mk
--- a/components/rtorrent/Makefile	Thu Oct 06 23:00:26 2016 -0700
+++ b/components/rtorrent/Makefile	Fri Oct 07 05:45:06 2016 -0700
@@ -64,16 +64,6 @@
 CONFIGURE_OPTIONS +=	--disable-static
 CONFIGURE_OPTIONS +=	--disable-debug
 
-# Delete this when libtorrent is updated in the build servers
-LIBTORRENT_BASE = $(WS_COMPONENTS)/libtorrent/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(LIBTORRENT_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L$(LIBTORRENT_BASE)$(USRLIB.$(BITS))
-CXXFLAGS += -I$(LIBTORRENT_BASE)$(USRINCDIR)
-CXXFLAGS += -I$(LIBTORRENT_BASE)$(USRINCDIR)/torrent
-CXXFLAGS += -I$(LIBTORRENT_BASE)$(USRINCDIR)/torrent/utils
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_$(BITS)="$(LIBTORRENT_BASE)$(USRLIB.$(BITS))"
-#end Delete
-
 REQUIRED_PACKAGES += developer/build/automake-115
 REQUIRED_PACKAGES += library/c++/sigcpp
 REQUIRED_PACKAGES += library/libtorrent
--- a/components/rtorrent/depend.mk	Thu Oct 06 23:00:26 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-rtorrent: libtorrent