Compare commits

...

6 Commits

Author SHA1 Message Date
Erik Ekman ec5c89a368
Merge pull request #93 from ffontaine/master
src/osflags: fully fix cross-compilation
2023-11-30 00:29:17 +01:00
Erik Ekman fc174d5e37 Bump github checkout action version
"The following actions uses node12 which is deprecated and will be forced to run on node16: actions/checkout@v2."
2023-11-30 00:26:17 +01:00
Erik Ekman 3b1d3a5d4c
Merge pull request #95 from mmuman/haiku-fixes
Haiku fixes
2023-11-30 00:17:17 +01:00
François Revol 39c3154a77 Haiku has daemon() in libbsd 2023-11-18 18:20:22 +01:00
François Revol 8ba813f08e osflags: on Haiku, require BSD headers and lib 2023-11-18 18:19:14 +01:00
Fabrice Fontaine a5d71d0761 src/osflags: fully fix cross-compilation
Cross-compilation was only partially fixed by
024481c94b
as selinux was still enabled depending on host file existence

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2023-11-02 23:03:15 +01:00
7 changed files with 13 additions and 10 deletions

View File

@ -11,7 +11,7 @@ jobs:
runs-on: macos-12
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: make
uses: vmactions/freebsd-vm@v0
with:

View File

@ -12,7 +12,7 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: make
run: make
- name: install check

View File

@ -11,7 +11,7 @@ jobs:
runs-on: macos-12
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: make
uses: vmactions/openbsd-vm@v0
with:

View File

@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: make
run: make
- name: install check
@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: nttld/setup-ndk@v1
with:
ndk-version: r21e

View File

@ -15,7 +15,7 @@ jobs:
shell: msys2 {0}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: msys2/setup-msys2@v2
with:
msystem: MINGW64

View File

@ -57,7 +57,7 @@
const unsigned char raw_header[RAW_HDR_LEN] = { 0x10, 0xd1, 0x9e, 0x00 };
/* daemon(3) exists only in 4.4BSD or later, and in GNU libc */
#if !defined(ANDROID) && !defined(WINDOWS32) && !(defined(BSD) && (BSD >= 199306)) && !defined(__GLIBC__)
#if !defined(ANDROID) && !defined(WINDOWS32) && !(defined(BSD) && (BSD >= 199306)) && !defined(__GLIBC__) && !defined(__HAIKU__)
static int daemon(int nochdir, int noclose)
{
int fd, i;

View File

@ -13,14 +13,14 @@ link)
echo '-lsocket -lbind -lbsd';
;;
Haiku)
echo '-lnetwork';
echo '-lnetwork -lbsd';
;;
windows32)
echo '-lws2_32 -liphlpapi';
;;
Linux)
FLAGS="";
[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux";
"$PKG_CONFIG" --exists libselinux && FLAGS="$FLAGS $($PKG_CONFIG --libs libselinux)";
"$PKG_CONFIG" --exists libsystemd-daemon && FLAGS="$FLAGS $($PKG_CONFIG --libs libsystemd-daemon)";
"$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS $($PKG_CONFIG --libs libsystemd)";
echo $FLAGS;
@ -35,12 +35,15 @@ cflags)
BeOS)
echo '-Dsocklen_t=int';
;;
Haiku)
echo '-D_DEFAULT_SOURCE';
;;
Darwin)
echo '-D__APPLE_USE_RFC_3542';
;;
Linux)
FLAGS="-D_GNU_SOURCE"
[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON";
"$PKG_CONFIG" --exists libselinux && FLAGS="$FLAGS -DHAVE_SETCON";
"$PKG_CONFIG" --exists libsystemd-daemon && FLAGS="$FLAGS -DHAVE_SYSTEMD";
"$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS -DHAVE_SYSTEMD";
echo $FLAGS;