Commit Graph

64 Commits

Author SHA1 Message Date
Nikita Popov
64cebf3d9a Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Make iconv errno support test pass on Solaris.
2020-10-09 15:25:23 +02:00
Nikita Popov
58af1e156e Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Make iconv errno support test pass on Solaris.
2020-10-09 15:24:53 +02:00
Petr Sumbera
07a4185df1 Make iconv errno support test pass on Solaris.
Closes GH-6291.
2020-10-09 15:24:36 +02:00
Nikita Popov
8bc505cf47 Remove some duplicate iconv path logic
PHP_SETUP_ICONV already adds the include path to INCLUDES and the
library path to SHARED_LIBADD.
2020-08-07 18:10:29 +02:00
Nikita Popov
7bd1d70341 Remove PHP_ICONV_H_PATH
Directly include <iconv.h> instead, now that the giconv.h
distinction no longer exists.
2020-08-07 17:03:41 +02:00
Nikita Popov
2d359749a4 Remove giconv support
The best information I was able to find about this is this mail
from 2009 which indicates that giconv is an old FreeBSD iconv
implementation that has long since been superseded by libiconv.

https://lists.samba.org/archive/samba-technical/2009-June/065177.html
2020-08-07 17:03:41 +02:00
Nikita Popov
65592840f0 Remove more leftovers of PHP_DEFINE handling 2020-08-07 17:03:41 +02:00
Nikita Popov
e6f7784210 Don't use PHP_DEFINE in iconv
iconv is the only consumer of this custom define mechanism that
puts every define into a single file. Use the standard mechanism
instead.
2020-08-07 14:29:04 +02:00
Christoph M. Becker
66d8d0c7d7 Drop support for iconv without proper errno setting
It is hard to impossible to work around iconv() implementations which
do not properly set errno according to POSIX.  We therefore do no
longer allow to build against such iconv() implementations.

Co-Authored-By: Nikita Popov <nikita.ppv@googlemail.com>
2020-03-17 14:02:29 +01:00
Christoph M. Becker
fec71e3f25 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #78342: Bus error in configure test for iconv //IGNORE
2019-07-29 08:51:33 +02:00
Christoph M. Becker
585131f901 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix #78342: Bus error in configure test for iconv //IGNORE
2019-07-29 08:50:39 +02:00
Christoph M. Becker
30eb4b3563 Fix #78342: Bus error in configure test for iconv //IGNORE
We have to check the return value of iconv_open() for error, to avoid
that and potentially other undesired behavior of iconv().
2019-07-29 08:48:13 +02:00
Peter Kokot
75fb74860d Normalize comments in *nix build system m4 files
Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
  favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now
2019-05-12 18:43:03 +02:00
Peter Kokot
9df6a1e4dd Add AS_HELP_STRING to *nix build configure options
The Autoconf's default AS_HELP_STRING macro can properly format help
strings [1] so watching out if columns are aligned manually is not
anymore.

[1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings
2019-03-07 20:36:59 +01:00
Peter Kokot
f2e4de8b56 Fix AC_RUN_IFELSE calls when cross-compiling
AC_RUN_IFELSE program can't be run when cross-compiling. This fix removes
warnings given by autotools scripts.
2018-07-30 06:38:59 +02:00
Peter Kokot
4371945b8b Replace obsolete AC_TRY_FOO with AC_FOO_IFELSE
Autoconf 2.50 released in 2001 made several macros obsolete including
the AC_TRY_RUN, AC_TRY_COMPILE and AC_TRY_LINK:
http://git.savannah.gnu.org/cgit/autoconf.git/tree/ChangeLog.2

These macros should be replaced with the current AC_FOO_IFELSE instead:
- AC_TRY_RUN with AC_RUN_IFELSE and AC_LANG_SOURCE
- AC_TRY_LINK with AC_LINK_IFELSE and AC_LANG_PROGRAM
- AC_TRY_COMPILE with AC_COMPILE_IFELSE and AC_LANG_PROGRAM

PHP 5.4 to 7.1 require Autoconf 2.59+ version, PHP 7.2 and above require
2.64+ version, and the PHP 7.2 phpize script requires 2.59+ version which
are all greater than above mentioned 2.50 version therefore systems
should be well supported by now.

This patch was created with the help of autoupdate script:
autoupdate <file>

Reference docs:
- https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html
- https://www.gnu.org/software/autoconf/manual/autoconf-2.59/autoconf.pdf
2018-07-30 02:36:38 +02:00
Peter Kokot
8d3f8ca12a Remove unused Git attributes ident
The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.

In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.

This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.
2018-07-25 00:53:25 +02:00
Stanislav Malyshev
f69e5d3b19 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix bad copypaste
2015-06-11 01:52:39 -07:00
Stanislav Malyshev
cd927cca50 fix bad copypaste 2015-06-11 01:51:55 -07:00
Stanislav Malyshev
473ec539a1 Fix #48147 - implement manual handling of //IGNORE for broken libc
Conflicts:
	ext/iconv/iconv.c
2015-05-09 18:54:40 -07:00
Stanislav Malyshev
f8f1d275cf Fix #48147 - implement manual handling of //IGNORE for broken libc 2015-05-08 12:55:39 -07:00
Anatol Belski
fea10f6a5e ext/iconv, ext/json and ext/session use static tsrmls pointer 2014-10-17 14:16:40 +02:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text.
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Antony Dovgal
6905cf2982 detect IBM iconv implementation and use correct encoding names 2007-12-04 11:26:54 +00:00
Antony Dovgal
544e021080 fix iconv cross-compilation 2007-03-01 11:29:34 +00:00
foobar
d70b36aec5 MFB 2006-01-03 13:25:33 +00:00
foobar
33978e8e33 - Fixed bug #35288 (iconv() function defined as libiconv()) 2006-01-03 13:20:13 +00:00
foobar
40af0645b9 proper quoting, breaking, etc. 2005-10-13 19:28:47 +00:00
Antony Dovgal
956dea1e37 correct it one more time (grrr) 2005-10-13 15:22:20 +00:00
Antony Dovgal
c387f9b359 correct the fix 2005-10-13 15:18:37 +00:00
Antony Dovgal
3c6d14bd0b fix #34856 (configure fails to detect libiconv's type) 2005-10-13 15:13:29 +00:00
foobar
6a58298bf6 - Plain path passed to PHP_INSTALL_HEADERS needs to have trailing / 2005-06-20 00:52:59 +00:00
foobar
626253940e - Added PHP_INSTALL_HEADERS() macro
- Fixed several VPATH build issues
- Changed all awk calls to use $AWK
- Changed all mkdir calls to use "$php_shtool mkdir"
2005-05-07 02:51:53 +00:00
foobar
34805e8d39 - Fixed all buildconf warnings + cross-compiling issues 2005-02-24 19:27:10 +00:00
Antony Dovgal
6074423330 fix Konstantin's last name Chugeuv -> Chuguev 2005-01-10 21:37:17 +00:00
Derick Rethans
48b118968f - MF43: Install the iconv extension headers to <installpath>/ext/iconv so that
external extensions can use them.
2004-12-06 20:39:20 +00:00
Joe Orton
2685ca935f Update extensions to use /path/to/$PHP_LIBDIR rather than /path/to/lib
to support multi-ABI platforms.
2004-11-03 14:32:52 +00:00
Derick Rethans
edce707f3b - Fixed text. 2004-07-14 09:54:02 +00:00
Derick Rethans
3c28fbd6dd - Enable iconv by default 2004-04-14 07:42:38 +00:00
Moriyoshi Koizumi
86e2c16d9c Add further check for "#include MACRO" style syntax 2003-08-28 06:04:48 +00:00
foobar
57ca69c014 Revert the fix for now 2003-07-30 21:56:45 +00:00
foobar
81c5e49a68 Fix build on certain platforms which do not accept #include FOOBAR 2003-07-30 14:09:42 +00:00
Moriyoshi Koizumi
c5e123f584 oops 2003-07-06 21:10:02 +00:00
Moriyoshi Koizumi
716a34a4d0 Avoid miscellaneous conflicts between glibc's iconv and libiconv. 2003-07-06 21:08:50 +00:00
Moriyoshi Koizumi
6b4a5bfd8c Simplified config scripts 2003-07-06 17:51:46 +00:00
Moriyoshi Koizumi
a00abb6850 Fixed library capability detection behaviour.
# Whew! I've fixed all the known problems.
# And should I become a maintainer of this module?
2002-10-31 20:23:53 +00:00
Moriyoshi Koizumi
e8cf2253fb Improved library identification 2002-10-29 16:18:12 +00:00
Moriyoshi Koizumi
764df05768 *** empty log message *** 2002-10-11 17:48:39 +00:00
foobar
0654763cc6 ws fix 2002-10-11 15:25:36 +00:00
Moriyoshi Koizumi
1a867685a0 Added ICONV_IMPL and ICONV_VERSION constants.
@- Added ICONV_IMPL and ICONV_VERSION constants to iconv extension to
@  indicate which iconv implementation is used. (Moriyoshi)
2002-10-11 07:50:47 +00:00