diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch')
| -rw-r--r-- | dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch b/dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch new file mode 100644 index 000000000000..a3ce560dbfbd --- /dev/null +++ b/dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch @@ -0,0 +1,123 @@ +make static libs optional. already sent upstream. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,6 +46,8 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development") + "Static library, good if you want to embed libftdi1 in your application.") + set(CPACK_COMPONENT_HEADERS_DESCRIPTION + "C/C++ header files.") ++ ++option ( STATICLIBS "Build static libraries" ON ) + + set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development") + set(CPACK_COMPONENT_STATICLIBS_GROUP "Development") +--- a/ftdipp/CMakeLists.txt ++++ b/ftdipp/CMakeLists.txt +@@ -30,12 +30,16 @@ if (FTDIPP) + set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) + + # Static library +- add_library(ftdipp1-static STATIC ${cpp_sources}) +- set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") ++ if (STATICLIBS) ++ add_library(ftdipp1-static STATIC ${cpp_sources}) ++ set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") ++ endif (STATICLIBS) + + # Prevent clobbering each other during the build + set_target_properties(ftdipp1 PROPERTIES CLEAN_DIRECT_OUTPUT 1) +- set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++ if (STATICLIBS) ++ set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++ endif (STATICLIBS) + + # Dependencies + target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES}) +@@ -46,10 +50,12 @@ if (FTDIPP) + LIBRARY DESTINATION lib${LIB_SUFFIX} + COMPONENT sharedlibs + ) +- install( TARGETS ftdipp1-static +- ARCHIVE DESTINATION lib${LIB_SUFFIX} +- COMPONENT staticlibs +- ) ++ if (STATICLIBS) ++ install( TARGETS ftdipp1-static ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} ++ COMPONENT staticlibs ++ ) ++ endif (STATICLIBS) + install( FILES ${cpp_headers} + DESTINATION include/${PROJECT_NAME} + COMPONENT headers +@@ -61,10 +67,12 @@ if (FTDIPP) + DESTINATION bin + COMPONENT sharedlibs + ) +- install( TARGETS ftdipp1-static +- DESTINATION bin +- COMPONENT staticlibs +- ) ++ if (STATICLIBS) ++ install( TARGETS ftdipp1-static ++ DESTINATION bin ++ COMPONENT staticlibs ++ ) ++ endif (STATICLIBS) + install( FILES ${cpp_headers} + DESTINATION include/${PROJECT_NAME} + COMPONENT headers +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -28,11 +28,15 @@ set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION} + + # Static library + add_library(ftdi1-static STATIC ${c_sources}) +-set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1") ++if (STATICLIBS) ++ set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1") ++endif (STATICLIBS) + + # Prevent clobbering each other during the build + set_target_properties(ftdi1 PROPERTIES CLEAN_DIRECT_OUTPUT 1) +-set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++if (STATICLIBS) ++ set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++endif (STATICLIBS) + + # Dependencies + target_link_libraries(ftdi1 ${LIBUSB_LIBRARIES}) +@@ -45,10 +49,12 @@ if(${UNIX}) + COMPONENT sharedlibs + ) + +- install( TARGETS ftdi1-static +- ARCHIVE DESTINATION lib${LIB_SUFFIX} +- COMPONENT staticlibs +- ) ++ if (STATICLIBS) ++ install( TARGETS ftdi1-static ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} ++ COMPONENT staticlibs ++ ) ++ endif (STATICLIBS) + + install( FILES ${c_headers} + DESTINATION include/${PROJECT_NAME} +@@ -64,10 +70,12 @@ if(${WIN32}) + COMPONENT sharedlibs + ) + +- install( TARGETS ftdi1-static +- DESTINATION bin +- COMPONENT staticlibs +- ) ++ if (STATICLIBS) ++ install( TARGETS ftdi1-static ++ DESTINATION bin ++ COMPONENT staticlibs ++ ) ++ endif (STATICLIBS) + + install( FILES ${c_headers} + DESTINATION include/${PROJECT_NAME} |