Skip to content

Commit 6559284

Browse files
committed
Remove more leftovers of PHP_DEFINE handling
1 parent 327db7e commit 6559284

File tree

4 files changed

+0
-29
lines changed

4 files changed

+0
-29
lines changed

.gitignore

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,6 @@ build/PHP-Parser-*
8989
config.h
9090
config.h.in
9191
/ext/date/lib/timelib_config.h
92-
/ext/iconv/php_have_bsd_iconv.h
93-
/ext/iconv/php_have_glibc_iconv.h
94-
/ext/iconv/php_have_ibm_iconv.h
95-
/ext/iconv/php_have_iconv.h
96-
/ext/iconv/php_have_libiconv.h
97-
/ext/iconv/php_iconv_aliased_libiconv.h
98-
/ext/iconv/php_iconv_broken_ignore.h
99-
/ext/iconv/php_iconv_supports_errno.h
100-
/ext/iconv/php_php_iconv_h_path.h
101-
/ext/iconv/php_php_iconv_impl.h
10292
/main/build-defs.h
10393
/main/php_config.h.in
10494
/main/php_config.h

build/Makefile.global

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ distclean: clean
123123
rm -f ext/date/lib/timelib_config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
124124
rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
125125
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
126-
rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
127126
rm -f ext/phar/phar.phar ext/phar/phar.php
128127
rm -f ext/opcache/jit/zend_jit_x86.c
129128
if test "$(srcdir)" != "$(builddir)"; then \

build/php.m4

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,19 +1924,6 @@ AC_DEFUN([PHP_SETUP_ICONV], [
19241924
found_iconv=no
19251925
unset ICONV_DIR
19261926
1927-
dnl Create the directories for a VPATH build.
1928-
$php_shtool mkdir -p ext/iconv
1929-
1930-
echo > ext/iconv/php_have_bsd_iconv.h
1931-
echo > ext/iconv/php_have_ibm_iconv.h
1932-
echo > ext/iconv/php_have_glibc_iconv.h
1933-
echo > ext/iconv/php_have_libiconv.h
1934-
echo > ext/iconv/php_have_iconv.h
1935-
echo > ext/iconv/php_php_iconv_impl.h
1936-
echo > ext/iconv/php_iconv_aliased_libiconv.h
1937-
echo > ext/iconv/php_php_iconv_h_path.h
1938-
echo > ext/iconv/php_iconv_supports_errno.h
1939-
19401927
dnl Check libc first if no path is provided in --with-iconv.
19411928
if test "$PHP_ICONV" = "yes"; then
19421929
dnl Reset LIBS temporarily as it may have already been included -liconv in.

ext/iconv/config.m4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ int main() {
8989
])
9090
fi
9191

92-
echo > ext/iconv/php_have_bsd_iconv.h
93-
echo > ext/iconv/php_have_glibc_iconv.h
94-
echo > ext/iconv/php_have_libiconv.h
95-
echo > ext/iconv/php_have_ibm_iconv.h
96-
9792
case "$iconv_impl_name" in
9893
gnu_libiconv [)]
9994
AC_DEFINE([PHP_ICONV_IMPL],["libiconv"],[Which iconv implementation to use])

0 commit comments

Comments
 (0)