Skip to content

Commit 968958f

Browse files
committed
PHPC-2019: Remove Solaris checks in m4 build scripts
libmongoc removed Solaris support in version 1.8.0 so there is no reason to retain these checks.
1 parent e9d5697 commit 968958f

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

scripts/autotools/libmongoc/FindDependencies.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
# Solaris needs to link against socket libs
2-
if test "$os_solaris" = "yes"; then
3-
PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -D__EXTENSIONS__"
4-
PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -D_XOPEN_SOURCE=1"
5-
PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
6-
PHP_ADD_LIBRARY([socket],,[MONGODB_SHARED_LIBADD])
7-
PHP_ADD_LIBRARY([nsl],,[MONGODB_SHARED_LIBADD])
8-
fi
9-
101
# Check for shm functions
112
AC_CHECK_FUNCS([shm_open],[],[
123
AC_CHECK_LIB([rt],

scripts/autotools/libmongoc/PlatformFlags.m4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,3 @@ AS_IF([test "$os_darwin" = "yes"],
88
[AX_CHECK_COMPILE_FLAG([-Wno-unneeded-internal-declaration], [STD_CFLAGS="$STD_CFLAGS -Wno-unneeded-internal-declaration"])])
99
AS_IF([test "$os_darwin" = "yes"],
1010
[AX_CHECK_COMPILE_FLAG([-Wno-error=unused-command-line-argument], [STD_CFLAGS="$STD_CFLAGS -Wno-error=unused-command-line-argument"])])
11-
dnl We know there are some cast-align issues on Solaris
12-
AS_IF([test "$os_solaris" = "yes"],
13-
[AX_CHECK_COMPILE_FLAG([-Wno-cast-align], [STD_CFLAGS="$STD_CFLAGS -Wno-cast-align"])])
14-
15-

0 commit comments

Comments
 (0)