diff options
| author | Tim Autry <tim.autry@outlook.com> | 2020-07-06 14:40:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 11:40:13 -0700 |
| commit | 4bd7c053bb9be3e8bd7ded8b524bf5191694cac9 (patch) | |
| tree | fbcb2c3bd30f459acc829405d88585640781a4c0 | |
| parent | 2a233a21b9ba174749fd076b5dac509b7f2cb0c9 (diff) | |
| download | vcpkg-4bd7c053bb9be3e8bd7ded8b524bf5191694cac9.tar.gz vcpkg-4bd7c053bb9be3e8bd7ded8b524bf5191694cac9.zip | |
[mpg123] Update portfile.cmake to accomodate OpenSUSE 15.x /lib /lib64 (#12287)
* Increment CONTROL file version
Increment CONTROL file version for mpg123 due to changes made to differentiate between library files being put in /lib64 instead of /lib on OpenSUSE 15.x linux
* Update portfile.cmake to differentiate between /lib64 and /lib libraries on OpenSUSE 15.x linux
Update portfile.cmake to differentiate between /lib64 and /lib libraries on OpenSUSE 15.x linux
| -rw-r--r-- | ports/mpg123/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mpg123/portfile.cmake | 48 |
2 files changed, 35 insertions, 15 deletions
diff --git a/ports/mpg123/CONTROL b/ports/mpg123/CONTROL index 6d495d364..deefddbda 100644 --- a/ports/mpg123/CONTROL +++ b/ports/mpg123/CONTROL @@ -1,4 +1,4 @@ Source: mpg123 -Version: 1.25.8-11 +Version: 1.25.8-12 Homepage: https://sourceforge.net/projects/mpg123/ Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3). diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 9f5515816..5190a17db 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -172,21 +172,41 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR VCPKG_CMAKE_SYSTEM_NAME STRE ${CURRENT_PACKAGES_DIR}/include ) - file( - INSTALL - "${SOURCE_PATH}/build/debug/lib/libmpg123.a" - "${SOURCE_PATH}/build/debug/lib/libout123.a" - DESTINATION - ${CURRENT_INSTALLED_DIR}/debug/lib - ) + if(EXISTS "${SOURCE_PATH}/build/debug/lib64/libmpg123.a") + file( + INSTALL + "${SOURCE_PATH}/build/debug/lib64/libmpg123.a" + "${SOURCE_PATH}/build/debug/lib64/libout123.a" + DESTINATION + ${CURRENT_INSTALLED_DIR}/debug/lib + ) + else() + file( + INSTALL + "${SOURCE_PATH}/build/debug/lib/libmpg123.a" + "${SOURCE_PATH}/build/debug/lib/libout123.a" + DESTINATION + ${CURRENT_INSTALLED_DIR}/debug/lib + ) + endif() - file( - INSTALL - "${SOURCE_PATH}/build/release/lib/libmpg123.a" - "${SOURCE_PATH}/build/release/lib/libout123.a" - DESTINATION - ${CURRENT_PACKAGES_DIR}/lib - ) + if(EXISTS "${SOURCE_PATH}/build/release/lib64/libmpg123.a") + file( + INSTALL + "${SOURCE_PATH}/build/release/lib64/libmpg123.a" + "${SOURCE_PATH}/build/release/lib64/libout123.a" + DESTINATION + ${CURRENT_PACKAGES_DIR}/lib + ) + else() + file( + INSTALL + "${SOURCE_PATH}/build/release/lib/libmpg123.a" + "${SOURCE_PATH}/build/release/lib/libout123.a" + DESTINATION + ${CURRENT_PACKAGES_DIR}/lib + ) + endif() endif() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |