Mon Jul 2 07:01:52 2012 UTC ()
Compile with GCC option "-march=i486" on x86 systems to make the required
function "__sync_bool_compare_and_swap_4" available. This fixes the build
of the "rtorrent" package under NetBSD/i386 5.1_STABLE.


(tron)
diff -r1.44 -r1.45 pkgsrc/net/libtorrent/Makefile
cvs diff -r1.44 -r1.45 pkgsrc/net/libtorrent/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libtorrent/Makefile 2012/05/16 17:42:37 1.44
+++ pkgsrc/net/libtorrent/Makefile 2012/07/02 07:01:51 1.45
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.44 2012/05/16 17:42:37 tron Exp $ 1# $NetBSD: Makefile,v 1.45 2012/07/02 07:01:51 tron Exp $
2 2
3DISTNAME= libtorrent-0.13.2 3DISTNAME= libtorrent-0.13.2
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= ${HOMEPAGE:=downloads/} 6MASTER_SITES= ${HOMEPAGE:=downloads/}
6 7
7OWNER= tron@NetBSD.org 8OWNER= tron@NetBSD.org
8HOMEPAGE= http://libtorrent.rakshasa.no/ 9HOMEPAGE= http://libtorrent.rakshasa.no/
9COMMENT= BitTorrent library written in C++ for *nix 10COMMENT= BitTorrent library written in C++ for *nix
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 16USE_LIBTOOL= yes
16USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
@@ -34,25 +35,29 @@ CONFIGURE_ARGS+= --enable-aligned @@ -34,25 +35,29 @@ CONFIGURE_ARGS+= --enable-aligned
34 35
35.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin" 36.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
36CONFIGURE_ARGS+= --with-kqueue 37CONFIGURE_ARGS+= --with-kqueue
37.endif 38.endif
38 39
39.include "../../mk/compiler.mk" 40.include "../../mk/compiler.mk"
40 41
41# See http://libtorrent.rakshasa.no/ticket/96 42# See http://libtorrent.rakshasa.no/ticket/96
42.if !empty(CC_VERSION:Mgcc-4.*) 43.if !empty(CC_VERSION:Mgcc-4.*)
43CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \ 44CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \
44 -fno-inline -fforce-addr 45 -fno-inline -fforce-addr
45.endif 46.endif
46 47
 48.if !empty(CC_VERSION:Mgcc-*) && !empty(MACHINE_ARCH:Mi?86)
 49CXXFLAGS+= -march=i486
 50.endif
 51
47.include "../../security/openssl/buildlink3.mk" 52.include "../../security/openssl/buildlink3.mk"
48.if !exists(${BUILDLINK_PREFIX.openssl}/lib/pkgconfig/openssl.pc) 53.if !exists(${BUILDLINK_PREFIX.openssl}/lib/pkgconfig/openssl.pc)
49OPENSSL_CFLAGS= -I${BUILDLINK_PREFIX.openssl}/include 54OPENSSL_CFLAGS= -I${BUILDLINK_PREFIX.openssl}/include
50OPENSSL_LIBS= -L${BUILDLINK_PREFIX.openssl}/lib \ 55OPENSSL_LIBS= -L${BUILDLINK_PREFIX.openssl}/lib \
51 -W,-lR${BUILDLINK_PREFIX.openssl}/lib 56 -W,-lR${BUILDLINK_PREFIX.openssl}/lib
52 57
53CONFIGURE_ENV+= OPENSSL_CFLAGS=${OPENSSL_CFLAGS:Q} 58CONFIGURE_ENV+= OPENSSL_CFLAGS=${OPENSSL_CFLAGS:Q}
54CONFIGURE_ENV+= OPENSSL_LIBS=${OPENSSL_LIBS:Q} 59CONFIGURE_ENV+= OPENSSL_LIBS=${OPENSSL_LIBS:Q}
55.endif 60.endif
56 61
57.include "../../devel/libsigc++/buildlink3.mk" 62.include "../../devel/libsigc++/buildlink3.mk"
58.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"