Skip to content

Commit ba84a61

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: [ci skip] Update changelog Remove unused PHP_SYS_LFS m4 macro Remove unused PHP_SOLARIS_PIC_WEIRDNESS m4 macro Remove unused PHP_TARGET_RDYNAMIC m4 macro Remove unused AM_SET_LIBTOOL_VARIABLE m4 macro
2 parents 44ebbf0 + 3d05a6b commit ba84a61

File tree

2 files changed

+0
-99
lines changed

2 files changed

+0
-99
lines changed

Zend/acinclude.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@ AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
7979
AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
8080
])
8181

82-
AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
83-
LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
84-
])
85-
8682
dnl x87 floating point internal precision control checks
8783
dnl See: http://wiki.php.net/rfc/rounding
8884
AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[

acinclude.m4

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -271,25 +271,6 @@ dnl -------------------------------------------------------------------------
271271
dnl Compiler characteristics checks
272272
dnl -------------------------------------------------------------------------
273273

274-
dnl
275-
dnl PHP_TARGET_RDYNAMIC
276-
dnl
277-
dnl Checks whether -rdynamic is supported by the compiler. This
278-
dnl is necessary for some targets to populate the global symbol
279-
dnl table. Otherwise, dynamic modules would not be able to resolve
280-
dnl PHP-related symbols.
281-
dnl
282-
dnl If successful, adds -rdynamic to PHP_LDFLAGS.
283-
dnl
284-
AC_DEFUN([PHP_TARGET_RDYNAMIC],[
285-
if test -n "$GCC"; then
286-
PHP_CHECK_GCC_ARG(-rdynamic, gcc_rdynamic=yes)
287-
if test "$gcc_rdynamic" = "yes"; then
288-
PHP_LDFLAGS="$PHP_LDFLAGS -rdynamic"
289-
fi
290-
fi
291-
])
292-
293274
dnl
294275
dnl PHP_RUNPATH_SWITCH
295276
dnl
@@ -1524,82 +1505,6 @@ main() {
15241505
fi
15251506
])
15261507

1527-
dnl
1528-
dnl PHP_SOLARIS_PIC_WEIRDNESS
1529-
dnl
1530-
dnl Solaris requires main code to be position independent in order
1531-
dnl to let shared objects find symbols. Weird. Ugly.
1532-
dnl
1533-
dnl Must be run after all --with-NN options that let the user
1534-
dnl choose dynamic extensions, and after the gcc test.
1535-
dnl
1536-
AC_DEFUN([PHP_SOLARIS_PIC_WEIRDNESS],[
1537-
AC_MSG_CHECKING([whether -fPIC is required])
1538-
if test -n "$EXT_SHARED"; then
1539-
os=`uname -sr 2>/dev/null`
1540-
case $os in
1541-
"SunOS 5.6"|"SunOS 5.7"[)]
1542-
case $CC in
1543-
gcc*|egcs*)
1544-
CFLAGS="$CFLAGS -fPIC";;
1545-
*[)]
1546-
CFLAGS="$CFLAGS -fpic";;
1547-
esac
1548-
AC_MSG_RESULT([yes]);;
1549-
*[)]
1550-
AC_MSG_RESULT([no]);;
1551-
esac
1552-
else
1553-
AC_MSG_RESULT([no])
1554-
fi
1555-
])
1556-
1557-
dnl
1558-
dnl PHP_SYS_LFS
1559-
dnl
1560-
dnl The problem is that the default compilation flags in Solaris 2.6 won't
1561-
dnl let programs access large files; you need to tell the compiler that
1562-
dnl you actually want your programs to work on large files. For more
1563-
dnl details about this brain damage please see:
1564-
dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
1565-
dnl
1566-
dnl Written by Paul Eggert <[email protected]>.
1567-
dnl
1568-
AC_DEFUN([PHP_SYS_LFS],
1569-
[dnl
1570-
# If available, prefer support for large files unless the user specified
1571-
# one of the CPPFLAGS, LDFLAGS, or LIBS variables.
1572-
AC_MSG_CHECKING([whether large file support needs explicit enabling])
1573-
ac_getconfs=''
1574-
ac_result=yes
1575-
ac_set=''
1576-
ac_shellvars='CPPFLAGS LDFLAGS LIBS'
1577-
for ac_shellvar in $ac_shellvars; do
1578-
case $ac_shellvar in
1579-
CPPFLAGS[)] ac_lfsvar=LFS_CFLAGS ;;
1580-
*[)] ac_lfsvar=LFS_$ac_shellvar ;;
1581-
esac
1582-
eval test '"${'$ac_shellvar'+set}"' = set && ac_set=$ac_shellvar
1583-
(getconf $ac_lfsvar) >/dev/null 2>&1 || { ac_result=no; break; }
1584-
ac_getconf=`getconf $ac_lfsvar`
1585-
ac_getconfs=$ac_getconfs$ac_getconf
1586-
eval ac_test_$ac_shellvar=\$ac_getconf
1587-
done
1588-
case "$ac_result$ac_getconfs" in
1589-
yes[)] ac_result=no ;;
1590-
esac
1591-
case "$ac_result$ac_set" in
1592-
yes?*[)] ac_result="yes, but $ac_set is already set, so use its settings"
1593-
esac
1594-
AC_MSG_RESULT([$ac_result])
1595-
case $ac_result in
1596-
yes[)]
1597-
for ac_shellvar in $ac_shellvars; do
1598-
eval $ac_shellvar=\$ac_test_$ac_shellvar
1599-
done ;;
1600-
esac
1601-
])
1602-
16031508
dnl
16041509
dnl PHP_SOCKADDR_CHECKS
16051510
dnl

0 commit comments

Comments
 (0)