From 5fb38fc24623597f720313890b2f38776d48eb18 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 21 Jun 2019 21:08:52 -0600 Subject: [PATCH] cs: sync include path for {Free,Open}BSD --- racket/src/cs/c/configure | 2 ++ racket/src/cs/c/configure.ac | 2 ++ racket/src/rktio/rktio_convert.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure index f08aad6a58..4c4ba6c21e 100755 --- a/racket/src/cs/c/configure +++ b/racket/src/cs/c/configure @@ -3900,12 +3900,14 @@ case "$host_os" in ;; *freebsd*) MACH_OS=fb + CFLAGS="${CFLAGS} -I/usr/local/include" LIBS="${LIBS} -L/usr/local/lib -liconv -lm -lpthread -lossp-uuid" CPPFLAGS="${CPPFLAGS} -DELF_FIND_BOOT_SECTION" ELF_COMP="--expect-elf" ;; openbsd*) MACH_OS=ob + CFLAGS="${CFLAGS} -I/usr/local/include" LIBS="${LIBS} -L/usr/local/lib -liconv -lm -lpthread -lossp-uuid" LDFLAGS="${LDFLAGS} -Wl,-zwxneeded" # Can't strip until ELF lookup added to startup diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac index cbeddda440..0e37dab0cb 100644 --- a/racket/src/cs/c/configure.ac +++ b/racket/src/cs/c/configure.ac @@ -181,12 +181,14 @@ case "$host_os" in ;; *freebsd*) MACH_OS=fb + CFLAGS="${CFLAGS} -I/usr/local/include" LIBS="${LIBS} -L/usr/local/lib -liconv -lm -lpthread -lossp-uuid" CPPFLAGS="${CPPFLAGS} -DELF_FIND_BOOT_SECTION" ELF_COMP="--expect-elf" ;; openbsd*) MACH_OS=ob + CFLAGS="${CFLAGS} -I/usr/local/include" LIBS="${LIBS} -L/usr/local/lib -liconv -lm -lpthread -lossp-uuid" LDFLAGS="${LDFLAGS} -Wl,-zwxneeded" # Can't strip until ELF lookup added to startup diff --git a/racket/src/rktio/rktio_convert.c b/racket/src/rktio/rktio_convert.c index dcb9a8099e..6b7c37161f 100644 --- a/racket/src/rktio/rktio_convert.c +++ b/racket/src/rktio/rktio_convert.c @@ -37,6 +37,9 @@ static iconv_t iconv_open(const char *to, const char *from) { return -1; } static void iconv_close(iconv_t cd) { } static void init_iconv() { } +void rktio_set_dll_path(rktio_char16_t *p) { } +rktio_char16_t *rktio_get_dll_path(rktio_char16_t *s) { return NULL; } + #elif defined(RKTIO_SYSTEM_WINDOWS) static wchar_t *dlldir;