Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Specify link dependencies for static build #566

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Specify link dependencies for static build #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ ENDIF (NOT PKGCONFIG_INSTALL_DIR)

# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
INSTALL( FILES ${CMAKE_MODULE_PATH}/FindLibSolv.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )

# for shared libraries on windows (DLLs), we just export all symbols for now
SET(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
Expand Down Expand Up @@ -434,6 +433,32 @@ ENDIF (ENABLE_RPMDB)
IF (ENABLE_HAIKU)
SET (SYSTEM_LIBRARIES ${HAIKU_SYSTEM_LIBRARIES} ${SYSTEM_LIBRARIES})
ENDIF (ENABLE_HAIKU)

# For static libs we need to remember the link dependencies as well
IF (ENABLE_STATIC)
foreach( _lib_dep_path ${SYSTEM_LIBRARIES})
get_filename_component( _lib_dep_dir ${_lib_dep_path} PATH )
get_filename_component( _lib_dep ${_lib_dep_path} NAME_WE )

string( REGEX REPLACE "^lib" "" _lib_dep ${_lib_dep} )

set( _newDirEntry "-L${_lib_dep_dir}")
set( _newFileEntry "-l${_lib_dep}" )

list (FIND SOLVEXT_LIB_DEPENDENCIES_LIST ${_newDirEntry} _index)
if (${_index} LESS_EQUAL -1)
list( APPEND SOLVEXT_LIB_DEPENDENCIES_LIST ${_newDirEntry} )
endif()

list (FIND SOLVEXT_LIB_DEPENDENCIES_LIST ${_newFileEntry} _index)
if (${_index} LESS_EQUAL -1)
list( APPEND SOLVEXT_LIB_DEPENDENCIES_LIST ${_newFileEntry} )
endif()

endforeach()
list(JOIN SOLVEXT_LIB_DEPENDENCIES_LIST " " SOLVEXT_LIB_DEPENDENCIES )
ENDIF()

IF (HAVE_LINKER_AS_NEEDED)
SET (SYSTEM_LIBRARIES "-Wl,--as-needed" ${SYSTEM_LIBRARIES})
ENDIF (HAVE_LINKER_AS_NEEDED)
Expand All @@ -449,6 +474,11 @@ ADD_SUBDIRECTORY (doc)

MESSAGE (STATUS "Version: ${VERSION}")

# FindLibsolv
SET( LIBSOLV_EXT_DEPS "set(LIBSOLV_EXT_LIBRARY_DEPS ${SOLVEXT_LIB_DEPENDENCIES} )" )
CONFIGURE_FILE (${CMAKE_MODULE_PATH}/FindLibSolv.cmake.in ${CMAKE_BINARY_DIR}/cmake/modules/FindLibSolv.cmake @ONLY)
INSTALL( FILES ${CMAKE_BINARY_DIR}/cmake/modules/FindLibSolv.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )

####################################################################
# RPM SPEC #
####################################################################
Expand Down
10 changes: 6 additions & 4 deletions cmake/modules/FindLibSolv.cmake → cmake/modules/FindLibSolv.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ MARK_AS_ADVANCED(
LibSolv_INCLUDE_DIRS
)

@LIBSOLV_EXT_DEPS@

# Look for components
FOREACH(COMPONENT ${LibSolv_FIND_COMPONENTS})
STRING(TOUPPER ${COMPONENT} _UPPERCOMPONENT)
Expand All @@ -75,13 +77,13 @@ FOREACH(COMPONENT ${LibSolv_FIND_COMPONENTS})
SET(LibSolv_${COMPONENT}_FIND_QUIETLY ${LibSolv_FIND_QUIETLY})
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSolv_${COMPONENT} DEFAULT_MSG LIBSOLV_${_UPPERCOMPONENT}_LIBRARY)
MARK_AS_ADVANCED(
LIBSOLV_${_UPPERCOMPONENT}_FOUND
LIBSOLV_${_UPPERCOMPONENT}_LIBRARY
LIBSOLV_${_UPPERCOMPONENT}_FOUND
LIBSOLV_${_UPPERCOMPONENT}_LIBRARY
)
IF(LIBSOLV_${_UPPERCOMPONENT}_FOUND)
SET(LibSolv_LIBRARIES ${LibSolv_LIBRARIES} ${LIBSOLV_${_UPPERCOMPONENT}_LIBRARY})
SET(LibSolv_LIBRARIES ${LibSolv_LIBRARIES} ${LIBSOLV_${_UPPERCOMPONENT}_LIBRARY} ${LIBSOLV_${_UPPERCOMPONENT}_LIBRARY_DEPS})
ELSE()
SET(LibSolv_FOUND FALSE)
SET(LibSolv_FOUND FALSE)
ENDIF()
ENDFOREACH()

Expand Down
2 changes: 1 addition & 1 deletion libsolvext.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ Name: libsolvext
Description: Library for reading repositories
Version: @VERSION@
Requires: libsolv
Libs: -L${libdir} -lsolvext
Libs: -L${libdir} -lsolvext @SOLVEXT_LIB_DEPENDENCIES@
Cflags: -I${includedir}
20 changes: 20 additions & 0 deletions package/libsolv.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,26 @@ Group: Development/Libraries/C and C++
%if %{with shared}
Requires: %{libname} = %version
%endif

%if %{with static}
Requires: libxml2-devel
Requires: zlib-devel
%if %{with bz2}
%if 0%{?suse_version}
Requires: libbz2-devel
%else
Requires: bzip2-devel
%endif

%endif
%if %{with xz}
Requires: xz-devel
%endif

%if %{with zstd}
Requires: libzstd-devel
%endif
%endif
Requires: rpm-devel
Conflicts: libsatsolver-devel

Expand Down
Loading