Attachment #2151 for bug #2108

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2108
Collapse All | Expand All





  # set version
  if( _version )
    if( ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
      # OpenBSD: _soversion and _version both contains only major and minor
      string( REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" _dummy  "${_version}" )
      set( _version  "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" )
      set( _soversion  "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" )
    else( ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
      # General (Linux) case: _soversion contains only the major number of version
      string( REGEX MATCH "^[0-9]+" _soversion ${_version} )
    endif( ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
    set_target_properties( ${_target} PROPERTIES VERSION ${_version} SOVERSION ${_soversion} )
  endif( _version )


macro( tde_setup_architecture_flags )
  message( STATUS "Detected ${CMAKE_SYSTEM_PROCESSOR} CPU architecture" )
  ## Immediate symbol binding is available only for gcc but not on ARM architectures
  if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES arm* AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
    set( LINKER_IMMEDIATE_BINDING_FLAGS "-z\ now" CACHE INTERNAL "" FORCE )
  else( )
    set( LINKER_IMMEDIATE_BINDING_FLAGS "" CACHE INTERNAL "" FORCE )

Return to bug 2108

Lines 732-738 Link Here

(-)cmake/modules/TDEMacros.cmake.orig (-2 / +10 lines)
732		732
733	# set version	733	# set version
734	if( _version )	734	if( _version )
735	string( REGEX MATCH "^[0-9]+" _soversion ${_version} )	735	if( ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
		736	# OpenBSD: _soversion and _version both contains only major and minor
		737	string( REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" _dummy "${_version}" )
		738	set( _version "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" )
		739	set( _soversion "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" )
		740	else( ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
		741	# General (Linux) case: _soversion contains only the major number of version
		742	string( REGEX MATCH "^[0-9]+" _soversion ${_version} )
		743	endif( ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
736	set_target_properties( ${_target} PROPERTIES VERSION ${_version} SOVERSION ${_soversion} )	744	set_target_properties( ${_target} PROPERTIES VERSION ${_version} SOVERSION ${_soversion} )
737	endif( _version )	745	endif( _version )
738		746
Lines 1513-1519 Link Here
1513	macro( tde_setup_architecture_flags )	1521	macro( tde_setup_architecture_flags )
1514	message( STATUS "Detected ${CMAKE_SYSTEM_PROCESSOR} CPU architecture" )	1522	message( STATUS "Detected ${CMAKE_SYSTEM_PROCESSOR} CPU architecture" )
1515	## Immediate symbol binding is available only for gcc but not on ARM architectures	1523	## Immediate symbol binding is available only for gcc but not on ARM architectures
1516	if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES arm* )	1524	if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES arm* AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
1517	set( LINKER_IMMEDIATE_BINDING_FLAGS "-z\ now" CACHE INTERNAL "" FORCE )	1525	set( LINKER_IMMEDIATE_BINDING_FLAGS "-z\ now" CACHE INTERNAL "" FORCE )
1518	else( )	1526	else( )
1519	set( LINKER_IMMEDIATE_BINDING_FLAGS "" CACHE INTERNAL "" FORCE )	1527	set( LINKER_IMMEDIATE_BINDING_FLAGS "" CACHE INTERNAL "" FORCE )