diff options
| author | Remi Collet <remi@remirepo.net> | 2021-03-15 07:00:17 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-03-15 07:00:17 +0100 |
| commit | 8f7e291b6a838d1ebd80a4abbdce9a33d8f43948 (patch) | |
| tree | edb2c9cab3091816d782c5cd58c43c4616c5ff59 /38.patch | |
| parent | c51c14e6e33561aad1ce7795a3a25a6ec4d568b9 (diff) | |
update to 1.2.0RC1
drop all patches merged upstream
Diffstat (limited to '38.patch')
| -rw-r--r-- | 38.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/38.patch b/38.patch deleted file mode 100644 index e6197f2..0000000 --- a/38.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a5ca783eb121e2e467d70e576dda75dcba5f8ba7 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 4 Sep 2018 09:52:04 +0200 -Subject: [PATCH] fix libraries link order - ---- - config.m4 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config.m4 b/config.m4 -index da00fea..e00bfdb 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -34,16 +34,16 @@ if test "$PHP_FANN" != "no"; then - - LIBNAME=fann - LIBSYMBOL=fann_set_user_data -+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FANN_DIR/$PHP_LIBDIR, FANN_SHARED_LIBADD) -+ PHP_ADD_LIBRARY(m) - - PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, - [ -- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FANN_DIR/$PHP_LIBDIR, FANN_SHARED_LIBADD) -- AC_CHECK_LIB($LIBNAME,[fann_copy],[ AC_DEFINE(HAVE_FANN_2_2,1,[Fann library version 2.2]) ],[],[-lm]) -+ AC_CHECK_LIB($LIBNAME,[fann_copy],[ AC_DEFINE(HAVE_FANN_2_2,1,[Fann library version 2.2]) ],[],[]) - AC_DEFINE(HAVE_FANN,1,[Fann library found]) - ],[ - AC_MSG_ERROR([wrong libfann version (you need at least version 2.1) or lib not found]) - ],[ -- -L$FANN_DIR/$PHP_LIBDIR -lm - ]) - - PHP_SUBST(FANN_SHARED_LIBADD) |