generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-17 11:05:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1021 from drdzyk/cpp_master

Browse Source 
fix detection of linux based os
This commit is contained in:
Takatoshi Kondo
2022-05-25 20:24:05 +09:00
committed by GitHub
parent 63511f29db 07c5b00c4a
commit 05f654fd64
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/depends/zlib.sh vendored
View File

@@ -27,9 +27,9 @@ while getopts "b:t:p:" c; do
done done
mkdir $prefix || exit 1 mkdir $prefix || exit 1
wget https://zlib.net/zlib-1.2.11.tar.gz || exit 1 wget https://zlib.net/zlib-1.2.12.tar.gz || exit 1
tar -xf zlib-1.2.11.tar.gz || exit 1 tar -xf zlib-1.2.12.tar.gz || exit 1
cd zlib-1.2.11 cd zlib-1.2.12
build() build()
{ {

4
.github/workflows/gha.yml vendored
View File

@@ -36,7 +36,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ~/zlib-prefix/ path: ~/zlib-prefix/
key: ${{ runner.os }}-zlib-1-2-11-2021-08-09 key: ${{ runner.os }}-zlib-1-2-12-2021-08-09
- name: Build zlib - name: Build zlib
if: steps.cache-zlib.outputs.cache-hit != 'true' if: steps.cache-zlib.outputs.cache-hit != 'true'
@@ -111,7 +111,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ~/zlib-prefix/ path: ~/zlib-prefix/
key: ${{ runner.os }}-zlib-1-2-11-2021-08-09 key: ${{ runner.os }}-zlib-1-2-12-2021-08-09
- name: Build zlib - name: Build zlib
if: steps.cache-zlib.outputs.cache-hit != 'true' if: steps.cache-zlib.outputs.cache-hit != 'true'

14
appveyor.yml
View File

@@ -23,10 +23,10 @@ environment:
boost_subdir: lib32-msvc-14.0 boost_subdir: lib32-msvc-14.0
build_script: build_script:
- ps: | - ps: |
appveyor DownloadFile http://zlib.net/zlib-1.2.11.tar.gz -FileName zlib-1.2.11.tar.gz appveyor DownloadFile http://zlib.net/zlib-1.2.12.tar.gz -FileName zlib-1.2.12.tar.gz
7z x zlib-1.2.11.tar.gz 2> $null 7z x zlib-1.2.12.tar.gz 2> $null
7z x zlib-1.2.11.tar 2> $null 7z x zlib-1.2.12.tar 2> $null
cd zlib-1.2.11 cd zlib-1.2.12
md build md build
md prefix md prefix
@@ -34,7 +34,7 @@ build_script:
cmake ` cmake `
-G $env:msvc ` -G $env:msvc `
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.11\prefix" ` -D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.12\prefix" `
.. ..
if ($LastExitCode -ne 0) { exit $LastExitCode } if ($LastExitCode -ne 0) { exit $LastExitCode }
@@ -52,7 +52,7 @@ build_script:
-D MSGPACK_BUILD_EXAMPLES=ON ` -D MSGPACK_BUILD_EXAMPLES=ON `
-D MSGPACK_BUILD_TESTS=ON ` -D MSGPACK_BUILD_TESTS=ON `
-D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" ` -D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" `
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.11\prefix" ` -D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.12\prefix" `
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" ` -D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `
-D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" ` -D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" `
.. ..
@@ -62,5 +62,5 @@ build_script:
if ($LastExitCode -ne 0) { exit $LastExitCode } if ($LastExitCode -ne 0) { exit $LastExitCode }
test_script: test_script:
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir% - set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.12\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
- ctest -VV -C Release - ctest -VV -C Release

2
include/msgpack/predef/os/linux.h
View File

@@ -27,7 +27,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define MSGPACK_OS_LINUX MSGPACK_VERSION_NUMBER_NOT_AVAILABLE #define MSGPACK_OS_LINUX MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
#if !defined(MSGPACK_PREDEF_DETAIL_OS_DETECTED) && ( \ #if !defined(MSGPACK_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(linux) || defined(__linux) \ defined(linux) || defined(__linux) || defined(__linux__) \
) )
# undef MSGPACK_OS_LINUX # undef MSGPACK_OS_LINUX
# define MSGPACK_OS_LINUX MSGPACK_VERSION_NUMBER_AVAILABLE # define MSGPACK_OS_LINUX MSGPACK_VERSION_NUMBER_AVAILABLE

2
include/msgpack/sysdep.hpp
View File

@@ -88,7 +88,7 @@
#elif defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__) #elif defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__)
#include <arpa/inet.h> /* __BYTE_ORDER */ #include <arpa/inet.h> /* __BYTE_ORDER */
# if defined(linux) # if defined(linux) || defined(__linux__)
# include <byteswap.h> # include <byteswap.h>
# endif # endif