Remove some unused libs.

Nicky 2015-02-09 23:18:07 +01:00
parent 024c6b4749
commit f4e28461e7
4 changed files with 22 additions and 89 deletions

View File

@ -443,42 +443,6 @@
</map>
</map>
</map>
<key>db</key>
<map>
<key>license</key>
<string>bsd</string>
<key>license_file</key>
<string>LICENSES/db.txt</string>
<key>name</key>
<string>db</string>
<key>platforms</key>
<map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>8f57c413e0786681cbcb9ed2fb8a6d37</string>
<key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/db-5.1.25-linux-20110309.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>5590bab38ac57703252e3d425739fc2f</string>
<key>url</key>
<string>http://downloads.firestormviewer.org/installables/db-5.1.25-linux-x64-20131215.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
</map>
</map>
<key>dbusglib</key>
<map>
<key>license</key>
@ -575,42 +539,6 @@
</map>
</map>
</map>
<key>elfio</key>
<map>
<key>license</key>
<string>lgpl</string>
<key>license_file</key>
<string>LICENSES/elfio.txt</string>
<key>name</key>
<string>elfio</string>
<key>platforms</key>
<map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>031e6315a5c0829c9b9a2ec18aeb7ae3</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-elfio/rev/222074/arch/Linux/installer/elfio-1.0.3-linux-20110225.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>3c0c51c249d0e0320c576ba19e4424bf</string>
<key>url</key>
<string>http://downloads.firestormviewer.org/installables/elfio-1.0.3-linux-x64-20131215.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
</map>
</map>
<key>expat</key>
<map>
<key>license</key>

View File

@ -1,17 +1,17 @@
# -*- cmake -*-
set(DB_FIND_QUIETLY ON)
set(DB_FIND_REQUIRED ON)
if (USESYSTEMLIBS)
include(FindBerkeleyDB)
else (USESYSTEMLIBS)
if (LINUX)
# Need to add dependency pthread explicitely to support ld.gold.
use_prebuilt_binary(db)
set(DB_LIBRARIES db-5.1 pthread)
else (LINUX)
set(DB_LIBRARIES db-4.2)
endif (LINUX)
set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (USESYSTEMLIBS)
# set(DB_FIND_QUIETLY ON)
# set(DB_FIND_REQUIRED ON)
#
# if (USESYSTEMLIBS)
# include(FindBerkeleyDB)
# else (USESYSTEMLIBS)
# if (LINUX)
# # Need to add dependency pthread explicitely to support ld.gold.
# use_prebuilt_binary(db)
# set(DB_LIBRARIES db-5.1 pthread)
# else (LINUX)
# set(DB_LIBRARIES db-4.2)
# endif (LINUX)
# set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
# endif (USESYSTEMLIBS)

View File

@ -20,9 +20,14 @@ else (USESYSTEMLIBS)
iconv
)
endif (DARWIN)
if (LINUX)
list(APPEND CURL_LIBRARIES
pthread
)
endif (LINUX)
if (LINUX AND ND_BUILD64BIT_ARCH)
list(APPEND CURL_LIBRARIES
idn
idn pthread
)
endif (LINUX AND ND_BUILD64BIT_ARCH)
endif (WINDOWS)

View File

@ -305,7 +305,7 @@ elseif(LINUX)
libboost_wave-mt.so.${BOOST_VERSION}.0
libcollada14dom.so
libcrypto.so.1.0.0
libdb-5.1.so
# libdb-5.1.so
libexpat.so
libexpat.so.1
libfreetype.so.6