Gentoo Archives: gentoo-commits

From: "Cedric Krier (cedk)" <cedk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/minbif/files: minbif-1.0.1-as-needed.patch
Date: Sun, 28 Feb 2010 14:05:39
Message-Id: E1Nljm4-0004dh-JL@stork.gentoo.org
1 cedk 10/02/28 14:05:36
2
3 Added: minbif-1.0.1-as-needed.patch
4 Log:
5 Version bump, fix for bug #299478 and add ~amd64
6 (Portage version: 2.1.7.16/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 net-im/minbif/files/minbif-1.0.1-as-needed.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/minbif/files/minbif-1.0.1-as-needed.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/minbif/files/minbif-1.0.1-as-needed.patch?rev=1.1&content-type=text/plain
13
14 Index: minbif-1.0.1-as-needed.patch
15 ===================================================================
16 diff -ru minbif-1.0.1~/CMakeLists.txt minbif-1.0.1/CMakeLists.txt
17 --- minbif-1.0.1~/CMakeLists.txt 2010-02-28 14:44:26.000000000 +0100
18 +++ minbif-1.0.1/CMakeLists.txt 2010-02-28 14:50:19.000000000 +0100
19 @@ -19,6 +19,7 @@
20 INCLUDE(CheckLibraryExists)
21
22 PKG_CHECK_MODULES(PURPLE REQUIRED purple>=2.4)
23 +PKG_CHECK_MODULES(GTHREAD REQUIRED gthread-2.0)
24
25 OPTION(ENABLE_MINBIF "Enable minbif compilation" ON)
26 OPTION(ENABLE_PLUGIN "Enable plugin build" OFF)
27 @@ -74,8 +75,8 @@
28 ENDIF (HAVE_LPAM)
29 ENDIF (ENABLE_PAM)
30
31 -INCLUDE_DIRECTORIES(${PURPLE_INCLUDE_DIRS} ${CACA_INCLUDE_DIRS} ${IMLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${FARSIGHT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} "src/")
32 -LINK_DIRECTORIES(${PURPLE_LINK_DIRS} ${CACA_LINK_DIRS} ${IMLIB_LINK_DIRS} ${GSTREAMER_LINK_DIRS} ${FARSIGHT_LINK_DIRS} ${LIBXML_LINK_DIRS})
33 +INCLUDE_DIRECTORIES(${PURPLE_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${CACA_INCLUDE_DIRS} ${IMLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${FARSIGHT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} "src/")
34 +LINK_DIRECTORIES(${PURPLE_LINK_DIRS} ${GTHREAD_LINK_DIRS} ${CACA_LINK_DIRS} ${IMLIB_LINK_DIRS} ${GSTREAMER_LINK_DIRS} ${FARSIGHT_LINK_DIRS} ${LIBXML_LINK_DIRS})
35
36 SET(CMAKE_BUILD_TYPE ${BUILD})
37 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Werror -Wall -Wextra -Wno-unused-parameter")
38 diff -ru minbif-1.0.1~/src/CMakeLists.txt minbif-1.0.1/src/CMakeLists.txt
39 --- minbif-1.0.1~/src/CMakeLists.txt 2010-02-28 14:44:26.000000000 +0100
40 +++ minbif-1.0.1/src/CMakeLists.txt 2010-02-28 14:51:40.000000000 +0100
41 @@ -44,7 +44,7 @@
42 irc/conversation_channel.cpp
43 )
44
45 -TARGET_LINK_LIBRARIES(${BIN_NAME} "-lpthread -lstdc++" ${PURPLE_LDFLAGS} ${CACA_LDFLAGS} ${IMLIB_LDFLAGS} ${GSTREAMER_LDFLAGS} ${FARSIGHT_LDFLAGS} ${PAM_LDFLAGS})
46 +TARGET_LINK_LIBRARIES(${BIN_NAME} "-lpthread -lstdc++" ${PURPLE_LIBRARIES} ${GTHREAD_LIBRARIES} ${CACA_LIBRARIES} ${IMLIB_LIBRARIES} ${GSTREAMER_LIBRARIES} ${FARSIGHT_LIBRARIES} ${PAM_LIBRARIES})
47
48 INSTALL(TARGETS ${BIN_NAME}
49 DESTINATION bin)