diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-07-02 15:50:36 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-07-02 18:32:47 +0200 |
| commit | fa90c8c82eef7d002327b63b9067dfa52ab560ac (patch) | |
| tree | b8742a6389cf3f6f512168f5a28e08332479f436 /debian/patches | |
| parent | 66842806f440b8dd4bcd14df1e8091f1c6d43258 (diff) | |
| download | php-fa90c8c82eef7d002327b63b9067dfa52ab560ac.tar.gz | |
Hack around the configure ordering that checks for phpdbg before checking for libedit
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/hack-phpdbg-to-explicitly-link-with-libedit.patch | 13 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/debian/patches/hack-phpdbg-to-explicitly-link-with-libedit.patch b/debian/patches/hack-phpdbg-to-explicitly-link-with-libedit.patch new file mode 100644 index 000000000..be6154d99 --- /dev/null +++ b/debian/patches/hack-phpdbg-to-explicitly-link-with-libedit.patch @@ -0,0 +1,13 @@ +--- php5.orig/sapi/phpdbg/config.m4 ++++ php5/sapi/phpdbg/config.m4 +@@ -22,7 +22,9 @@ if test "$PHP_PHPDBG" != "no"; then + PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.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 phpdbg_watch.c phpdbg_btree.c" + + if test "$PHP_READLINE" != "no" -o "$PHP_LIBEDIT" != "no"; then +- PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS" ++# PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS" ++# Temporary hack until this gets fixed ++ PHPDBG_EXTRA_LIBS="-ledit -ltermcap" + fi + + PHP_SUBST(PHP_PHPDBG_CFLAGS) diff --git a/debian/patches/series b/debian/patches/series index 7a15497bd..5d69f96ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -43,3 +43,4 @@ php-5.4.8-ldap_r.patch php-5.4.9-fixheader.patch php-5.6.0-noNO.patch php-5.6.0-oldpcre.patch +hack-phpdbg-to-explicitly-link-with-libedit.patch |