lib32-libevent/trunk/multilib.diff

   1 diff -u -r libevent-2.1.12-stable/CMakeLists.txt libevent-2.1.12-stable-lib32/CMakeLists.txt
   2 --- libevent-2.1.12-stable/CMakeLists.txt       2020-07-05 12:01:34.000000000 +0000
   3 +++ libevent-2.1.12-stable-lib32/CMakeLists.txt 2022-08-03 19:36:07.559379519 +0000
   4 @@ -162,10 +162,10 @@
   5      set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
   6  endif()
   7  if (NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
   8 -    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
   9 +    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib32)
  10  endif()
  11  if (NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
  12 -    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
  13 +    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib32)
  14  endif()
  15
  16  if (EVENT__ENABLE_VERBOSE_DEBUG)
  17 @@ -1453,7 +1453,7 @@
  18  #
  19
  20  set(EVENT_INSTALL_CMAKE_DIR
  21 -    "${CMAKE_INSTALL_PREFIX}/lib/cmake/libevent")
  22 +    "${CMAKE_INSTALL_PREFIX}/lib32/cmake/libevent")
  23
  24  export(PACKAGE libevent)
  25
  26 diff -u -r libevent-2.1.12-stable/cmake/AddEventLibrary.cmake libevent-2.1.12-stable-lib32/cmake/AddEventLibrary.cmake
  27 --- libevent-2.1.12-stable/cmake/AddEventLibrary.cmake  2020-07-05 12:01:34.000000000 +0000
  28 +++ libevent-2.1.12-stable-lib32/cmake/AddEventLibrary.cmake    2022-08-03 19:49:24.253528837 +0000
  29 @@ -13,7 +13,7 @@
  30  macro(generate_pkgconfig LIB_NAME)
  31      set(prefix      ${CMAKE_INSTALL_PREFIX})
  32      set(exec_prefix ${CMAKE_INSTALL_PREFIX})
  33 -    set(libdir      ${CMAKE_INSTALL_PREFIX}/lib)
  34 +    set(libdir      ${CMAKE_INSTALL_PREFIX}/lib32)
  35      set(includedir  ${CMAKE_INSTALL_PREFIX}/include)
  36
  37      set(VERSION ${EVENT_ABI_LIBVERSION})
  38 @@ -31,7 +31,7 @@
  39      configure_file("lib${LIB_NAME}.pc.in" "lib${LIB_NAME}.pc" @ONLY)
  40      install(
  41          FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_NAME}.pc"
  42 -        DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig"
  43 +        DESTINATION "${CMAKE_INSTALL_PREFIX}/lib32/pkgconfig"
  44      )
  45  endmacro()
  46
  47 @@ -40,9 +40,9 @@
  48  macro(export_install_target TYPE LIB_NAME OUTER_INCLUDES)
  49      if("${LIB_NAME}" STREQUAL "event")
  50          install(TARGETS "${LIB_NAME}_${TYPE}"
  51 -            LIBRARY DESTINATION "lib" COMPONENT lib
  52 -            ARCHIVE DESTINATION "lib" COMPONENT lib
  53 -            RUNTIME DESTINATION "lib" COMPONENT lib
  54 +            LIBRARY DESTINATION "lib32" COMPONENT lib
  55 +            ARCHIVE DESTINATION "lib32" COMPONENT lib
  56 +            RUNTIME DESTINATION "lib32" COMPONENT lib
  57              COMPONENT dev
  58          )
  59      else()
  60 @@ -67,9 +67,9 @@
  61          )
  62          install(TARGETS "${LIB_NAME}_${TYPE}"
  63              EXPORT LibeventTargets-${TYPE}
  64 -            LIBRARY DESTINATION "lib" COMPONENT lib
  65 -            ARCHIVE DESTINATION "lib" COMPONENT lib
  66 -            RUNTIME DESTINATION "lib" COMPONENT lib
  67 +            LIBRARY DESTINATION "lib32" COMPONENT lib
  68 +            ARCHIVE DESTINATION "lib32" COMPONENT lib
  69 +            RUNTIME DESTINATION "lib32" COMPONENT lib
  70              COMPONENT dev
  71          )
  72      endif()
  73 @@ -150,7 +150,7 @@
  74              set_target_properties(
  75                  "${LIB_NAME}_shared" PROPERTIES
  76                  OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}.${CURRENT_MINUS_AGE}"
  77 -                INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
  78 +                INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib32"
  79                  LINK_FLAGS "-compatibility_version ${COMPATIBILITY_VERSION} -current_version ${COMPATIBILITY_VERSION}.${EVENT_ABI_LIBVERSION_REVISION}")
  80          else()
  81              math(EXPR CURRENT_MINUS_AGE "${EVENT_ABI_LIBVERSION_CURRENT}-${EVENT_ABI_LIBVERSION_AGE}")
  82 @@ -159,7 +159,7 @@
  83                  OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}"
  84                  VERSION "${CURRENT_MINUS_AGE}.${EVENT_ABI_LIBVERSION_AGE}.${EVENT_ABI_LIBVERSION_REVISION}"
  85                  SOVERSION "${CURRENT_MINUS_AGE}"
  86 -                INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
  87 +                INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib32")
  88          endif()
  89
  90          if (NOT WIN32)
  91 @@ -181,7 +181,7 @@
  92          if (NOT WIN32)
  93              install(FILES
  94                  "$<TARGET_FILE_DIR:${LIB_NAME}_shared>/${LIB_LINK_NAME}"
  95 -                DESTINATION "lib"
  96 +                DESTINATION "lib32"
  97                  COMPONENT lib)
  98          endif()
  99      endif()
 100 diff -u -r libevent-2.1.12-stable/cmake/LibeventConfig.cmake.in libevent-2.1.12-stable-lib32/cmake/LibeventConfig.cmake.in
 101 --- libevent-2.1.12-stable/cmake/LibeventConfig.cmake.in        2020-07-05 12:01:34.000000000 +0000
 102 +++ libevent-2.1.12-stable-lib32/cmake/LibeventConfig.cmake.in  2022-08-03 19:35:46.016109621 +0000
 103 @@ -130,7 +130,7 @@
 104          unset(_event_lib CACHE)
 105          find_library(_event_lib
 106                      NAMES "event_${_comp}"
 107 -                    PATHS "${_INSTALL_PREFIX}/lib"
 108 +                    PATHS "${_INSTALL_PREFIX}/lib32"
 109                      NO_DEFAULT_PATH)
 110          if(_event_lib)
 111              list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}")