Author: glen Date: Sat Apr 9 14:19:02 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- remove bogus ltdl linking on mcrypt (-lltdl is on -lmcrypt not php ext)
---- Files affected:
packages/php:
php.spec (1.934 -> 1.935) , mcrypt-libs.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.934 packages/php/php.spec:1.935
--- packages/php/php.spec:1.934 Tue Apr 5 14:22:55 2011
+++ packages/php/php.spec Sat Apr 9 16:18:56 2011
@@ -104,7 +104,7 @@
%undefine with_filter
%endif
-%define rel 5
+%define rel 6
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -186,6 +186,7 @@
Patch59: %{name}-systzdata.patch
Patch60: %{name}-oracle-instantclient.patch
Patch61: %{name}-krb5-ac.patch
+Patch62: mcrypt-libs.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -1864,6 +1865,7 @@
%patch59 -p1
%patch60 -p1
%patch61 -p1
+%patch62 -p1
%{__rm} -r sapi/litespeed
gzip -dc %{SOURCE15} | tar xf - -C sapi/
@@ -3169,6 +3171,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.935 2011/04/09 14:18:56 glen
+- remove bogus ltdl linking on mcrypt (-lltdl is on -lmcrypt not php ext)
+
Revision 1.934 2011/04/05 12:22:55 jajcus
- kerberos5 bcond
================================================================
Index: packages/php/mcrypt-libs.patch
diff -u /dev/null packages/php/mcrypt-libs.patch:1.1
--- /dev/null Sat Apr 9 16:19:02 2011
+++ packages/php/mcrypt-libs.patch Sat Apr 9 16:18:56 2011
@@ -0,0 +1,19 @@
+--- php-5.3.6/ext/mcrypt/config.m4~ 2010-01-15 23:02:20.000000000 +0200
++++ php-5.3.6/ext/mcrypt/config.m4 2011-04-09 16:18:07.634572726 +0300
+@@ -36,7 +36,6 @@
+
+ PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
+ [
+- PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD)
+ AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
+ ],[
+ PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
+@@ -48,7 +47,7 @@
+ -L$MCRYPT_DIR/$PHP_LIBDIR
+ ])
+ ],[
+- -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl
++ -L$MCRYPT_DIR/$PHP_LIBDIR
+ ])
+
+ PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/$PHP_LIBDIR,
MCRYPT_SHARED_LIBADD)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.934&r2=1.935&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
