Skip to content

Commit 6edf146

Browse files
committed
1. Force libuuid usage for IBM i (os400). uuid functions from libc do not work on this platform (IBM/ibmi-oss-issues#82)
2. Added additional compilation parameters for building on IBM i
1 parent ed9cb1c commit 6edf146

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

build/apr_hints.m4

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,13 @@ dnl # Not a problem in 10.20. Otherwise, who knows?
433433
APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
434434
APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
435435
APR_SETIFNULL(apr_getservbyname_is_thread_safe, [yes])
436+
APR_SETIFNULL(ac_cv_func_uuid_create, [no])
437+
APR_SETIFNULL(ac_cv_func_uuid_generate, [yes])
438+
APR_SETIFNULL(ac_cv_search_uuid_create, [no])
439+
APR_SETIFNULL(ac_cv_search_uuid_generate, [yes])
440+
APR_ADDTO(CFLAGS, [-D_THREAD_SAFE -D_LINUX_SOURCE_COMPAT -pthread])
441+
APR_SETVAR(SHELL, [/qopensys/bin/sh])
442+
APR_SETVAR(CONFIG_SHELL, [/qopensys/bin/sh])
436443
;;
437444
*mingw*)
438445
APR_ADDTO(INTERNAL_CPPFLAGS, -DBINPATH=$apr_builddir/test/.libs)

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ case $host in
14781478
USE_SHMEM_SHMGET)
14791479
fi
14801480
;;
1481-
*aix* )
1481+
*aix* | *os400 )
14821482
# AIX cannot lseek() shared memory, and we always truncate/lseek together
14831483
APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET)
14841484
;;

0 commit comments

Comments
 (0)