Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build_linux_autotools_default_args:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: Install doc packages
run: sudo apt-get install -y texlive texinfo texi2html doxygen
- name: create configure
Expand All @@ -27,7 +27,7 @@ jobs:
build_linux_autotools_other_args:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: Install doc packages
run: sudo apt-get install -y texlive texinfo texi2html doxygen
- name: create configure
Expand All @@ -44,7 +44,7 @@ jobs:
build_linux_autotools_gcc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: create configure
run: autoreconf -i
- name: configure gcc
Expand All @@ -57,7 +57,7 @@ jobs:
build_linux_autotools_clang:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: create configure
run: autoreconf -i
- name: configure clang
Expand All @@ -68,7 +68,7 @@ jobs:
build_linux_autotools_crosscompile_mingw32:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: Install doc packages
run: sudo apt-get install -y gcc-mingw-w64
- name: create configure
Expand All @@ -82,7 +82,7 @@ jobs:
build_linux_autotools_prereleasecheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: Install doc packages
run: sudo apt-get install -y texlive texinfo texi2html doxygen
- name: create configure
Expand All @@ -95,7 +95,7 @@ jobs:
build_linux_autotools_docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: Install doc packages
run: sudo apt-get install -y texlive texinfo texi2html doxygen
- name: create configure
Expand All @@ -110,7 +110,7 @@ jobs:
build_linux_autotools_example:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: Install doc packages
run: sudo apt-get install -y texlive texinfo texi2html doxygen
- name: create configure
Expand All @@ -137,7 +137,7 @@ jobs:
build_linux_cmake:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: cmake cversion
run: cmake --version
- name: create configs
Expand All @@ -152,7 +152,7 @@ jobs:
build_linux_scanbuild:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: Install scan-build packages
run: sudo apt-get install -y clang-tools
- name: create configure
Expand All @@ -172,7 +172,7 @@ jobs:
build_linux_cmake_project_usage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: run test
run: |
cmake --version || exit 1
Expand Down
34 changes: 19 additions & 15 deletions .github/workflows/osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ jobs:
build_osx_autotools_default_args:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
# Brew may not have permission to install its packages
- name: change brew install folder permissions
run: sudo chmod -R a+rwx /usr/local/share/ || mkdir -p /usr/local/share/ -m a+rwx
- name: install maxtex
run: brew install --cask mactex
- name: install doc programs
run: brew install texi2html doxygen
run: brew install texlive texi2html doxygen texinfo
- name: install automake
run: brew install automake
- name: install libtool
run: brew install libtool
- name: install pkg-config
run: brew install pkgconfig
- name: create configure
Expand All @@ -36,16 +36,16 @@ jobs:
build_osx_autotools_other_args:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
# Brew may not have permission to install its packages
- name: change brew install folder permissions
run: sudo chmod -R a+rwx /usr/local/share/ || mkdir -p /usr/local/share/ -m a+rwx
- name: install maxtex
run: brew install --cask mactex
- name: install doc programs
run: brew install texi2html doxygen
run: brew install texlive texi2html doxygen texinfo
- name: install automake
run: brew install automake
- name: install libtool
run: brew install libtool
- name: install pkg-config
run: brew install pkgconfig
- name: create configure
Expand All @@ -62,12 +62,14 @@ jobs:
build_osx_autotools_gcc:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
# Brew may not have permission to install its packages
- name: change brew install folder permissions
run: sudo chmod -R a+rwx /usr/local/share/ || mkdir -p /usr/local/share/ -m a+rwx
- name: install automake
run: brew install automake
- name: install libtool
run: brew install libtool
- name: install pkg-config
run: brew install pkgconfig
- name: create configure
Expand All @@ -82,12 +84,14 @@ jobs:
build_osx_autotools_clang:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
# Brew may not have permission to install its packages
- name: change brew install folder permissions
run: sudo chmod -R a+rwx /usr/local/share/ || mkdir -p /usr/local/share/ -m a+rwx
- name: install automake
run: brew install automake
- name: install libtool
run: brew install libtool
- name: install pkg-config
run: brew install pkgconfig
- name: create configure
Expand All @@ -102,16 +106,16 @@ jobs:
build_osx_autotools_example:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
# Brew may not have permission to install its packages
- name: change brew install folder permissions
run: sudo chmod -R a+rwx /usr/local/share/ || mkdir -p /usr/local/share/ -m a+rwx
- name: install maxtex
run: brew install --cask mactex
- name: install doc programs
run: brew install texi2html doxygen
run: brew install texlive texi2html doxygen texinfo
- name: install automake
run: brew install automake
- name: install libtool
run: brew install libtool
- name: install pkg-config
run: brew install pkgconfig
- name: create configure
Expand All @@ -138,7 +142,7 @@ jobs:
build_osx_cmake:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: cmake cversion
run: cmake --version
- name: create configs
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ check_function_exists(mkstemp HAVE_MKSTEMP)
check_function_exists(realloc HAVE_REALLOC)
check_function_exists(setenv HAVE_DECL_SETENV)
check_function_exists(sigaction HAVE_SIGACTION)
check_function_exists(setitimer HAVE_SETITIMER)
check_function_exists(strdup HAVE_DECL_STRDUP)
check_function_exists(strsignal HAVE_DECL_STRSIGNAL)
check_function_exists(_getpid HAVE__GETPID)
Expand Down
3 changes: 3 additions & 0 deletions cmake/config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ typedef uint64_t uintmax_t;
/* Define to 1 if you have the 'sigaction' function. */
#cmakedefine HAVE_SIGACTION 1

/* Define to 1 if you have the 'setitimer' function. */
#cmakedefine HAVE_SETITIMER 1

/* Define to 1 if you have the <stdarg.h> header file. */
#cmakedefine HAVE_STDARG_H 1

Expand Down
1 change: 1 addition & 0 deletions lib/timer_delete.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@ int timer_delete(timer_t timerid CK_ATTRIBUTE_UNUSED)
* There is no support for alternative timers, so there is nothing
* to delete or reset.
*/
return 0;
#endif
}
1 change: 1 addition & 0 deletions lib/timer_settime.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@ int timer_settime(timer_t timerid CK_ATTRIBUTE_UNUSED,
/*
* There is no support for timers on the platform.
*/
return 0;
#endif
}
Loading