Re: com php-src: fix readline build error bugsnet #66576: config.m4 phpdbg.h

Le 27/01/2014 08:39, Bob Weinand a écrit : > Commit: 1c0fccfc9abaaea02ae717547bc3b69fcb2de86c > Author: krakjoe <joe.watkins@live.co.uk> Mon, 27 Jan 2014 07:39:34 +0000 > Parents: 2e4aed3673607fda63edaac2b9b69669c5c1ceec > Branches: PHP-5.6 > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=1c0fccfc9abaaea02ae717547bc3b69fcb2de86c > > Log: > fix readline build error bugsnet #66576 This break build with libedit. libtool ....... -lcrypt -lresolv -lcrypt -ledit -lncurses -lstdc++ -lz -lpcre -lrt -lm -ldl -lnsl -lxml2 -lz -lm -ldl -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lssl -lcrypto -lcrypt -lcrypt -lreadline -o sapi/phpdbg/phpdbg /usr/bin/ld: cannot find -lreadline Remi. P.S. I don't understand why we keep using readline, when its license (GPL) is not compatible with PHP one. > > Bugs: > https://bugs.php.net/66576 > > Changed paths: > M config.m4 > M phpdbg.h > > > Diff: > diff --git a/config.m4 b/config.m4 > index 274e640..3ad53ba 100644 > --- a/config.m4 > +++ b/config.m4 > @@ -20,9 +20,14 @@ if test "$PHP_PHPDBG" != "no"; then > PHP_PHPDBG_CFLAGS="-D_GNU_SOURCE" > PHP_PHPDBG_FILES="phpdbg.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c > phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c > phpdbg_frame.c" > > + if test "$PHP_READLINE" != "no"; then > + PHPDBG_EXTRA_LIBS="-lreadline" > + fi > + > PHP_SUBST(PHP_PHPDBG_CFLAGS) > PHP_SUBST(PHP_PHPDBG_FILES) > - > + PHP_SUBST(PHPDBG_EXTRA_LIBS) > + > PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/phpdbg/Makefile.frag]) > PHP_SELECT_SAPI(phpdbg, program, $PHP_PHPDBG_FILES, $PHP_PHPDBG_CFLAGS, > [$(SAPI_PHPDBG_PATH)]) > > diff --git a/phpdbg.h b/phpdbg.h > index 6b7afb2..68c505c 100644 > --- a/phpdbg.h > +++ b/phpdbg.h > @@ -149,7 +149,7 @@ > #define PHPDBG_AUTHORS "Felipe Pena, Joe Watkins and Bob Weinand" /* Ordered by last > name */ > #define PHPDBG_URL "http://phpdbg.com" > #define PHPDBG_ISSUES "¨Ï˜¬÷b > YQ =/úñ,http://github.com/krakjoe/phpdbg/issues" > -#define PHPDBG_VERSION "0.3.1" > +#define PHPDBG_VERSION "0.3.2" > #define PHPDBG_INIT_FILENAME ".phpdbginit" > /* }}} */ > >