Skip to content

Commit 1970daf

Browse files
committed
CI PCP Win: most of incompat is now fixed upstream
Most of the incompatibilities, which were patched, have already been fixed in upstream. just forward decl of struct timezone/timeval is still needed
1 parent d670e2e commit 1970daf

File tree

2 files changed

+7
-74
lines changed

2 files changed

+7
-74
lines changed

.github/scripts/install-common-deps.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,13 @@ install_pcp() {
107107
git clone https://github.com/libpcp/pcp.git
108108
(
109109
cd pcp
110-
if is_win; then # TODO TOREMOVE: check if still needed
111-
git am "$curdir"/pcp-win.patch
112-
fi
110+
# TODO TOREMOVE when not needed
111+
sed "/int gettimeofday/i\\
112+
struct timezone;\\
113+
struct timeval;\\
114+
" libpcp/src/windows/pcp_gettimeofday.h > fixed
115+
mv fixed libpcp/src/windows/pcp_gettimeofday.h
116+
113117
./autogen.sh || true # autogen exits with 1
114118
CFLAGS=-fPIC ./configure --disable-shared
115119
make -j "$(nproc)"

.github/scripts/pcp-win.patch

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)