[php-maint] Bug#615770: [Pkg-php-commits] [php/debian-sid] Fix FTBFS with gold or ld --no-add-needed (Closes: #615770) (Patch courtesy of Adrian Lang)

[Raphael Geissert]

Hi,

On Thursday 17 March 2011 09:58:18 Ondřej Surý wrote:
> ---
>  debian/patches/debbug#615770.patch |   13 +++++++++++++
>  debian/patches/series              |    1 +
>  2 files changed, 14 insertions(+), 0 deletions(-)
>  create mode 100644 debian/patches/debbug#615770.patch
> 
> diff --git a/debian/patches/debbug#615770.patch
> b/debian/patches/debbug#615770.patch new file mode 100644
> index 0000000..833ff16
> --- /dev/null
> +++ b/debian/patches/debbug#615770.patch
> @@ -0,0 +1,13 @@
> +diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
> +index ee5e85c..c1c10ee 100644
> +--- a/ext/openssl/config0.m4
> ++++ b/ext/openssl/config0.m4
> +@@ -12,6 +12,8 @@ if test "$PHP_OPENSSL" != "no"; then
> +   PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
> +   PHP_SUBST(OPENSSL_SHARED_LIBADD)
> +
> ++  PHP_ADD_LIBRARY(crypto)
> ++
> +   if test "$PHP_KERBEROS" != "no"; then
> +     PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
> +   fi

The patch is incomplete. Ubuntu already has a patch that only needs a minor 
cleanup (it patches a generated file.)

Will later take it upstream too (hoping it can be included in .6)

Cheers,
-- 
Raphael Geissert - Debian Developer
www.debian.org - get.debian.net