| 1 |
ssuominen 10/02/25 19:00:06 |
| 2 |
|
| 3 |
Added: mira-3.0.0-asneeded.patch |
| 4 |
Log: |
| 5 |
Fix ax_lib_expat.m4 macro to not use LDFLAGS for passing libraries wrt #305547 by Kacper Kowalik. |
| 6 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-biology/mira/files/mira-3.0.0-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/mira/files/mira-3.0.0-asneeded.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/mira/files/mira-3.0.0-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mira-3.0.0-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
http://bugs.gentoo.org/show_bug.cgi?id=305547 |
| 17 |
|
| 18 |
--- config/m4/ax_lib_expat.m4 |
| 19 |
+++ config/m4/ax_lib_expat.m4 |
| 20 |
@@ -96,6 +99,7 @@ |
| 21 |
|
| 22 |
EXPAT_CFLAGS="" |
| 23 |
EXPAT_LDFLAGS="" |
| 24 |
+ EXPAT_LIBS="" |
| 25 |
EXPAT_VERSION="" |
| 26 |
|
| 27 |
dnl |
| 28 |
@@ -105,7 +109,8 @@ |
| 29 |
|
| 30 |
if test -n "$expat_prefix"; then |
| 31 |
expat_include_dir="$expat_prefix/include" |
| 32 |
- expat_lib_flags="-L$expat_prefix/lib -lexpat" |
| 33 |
+ expat_lib_flags="-L$expat_prefix/lib" |
| 34 |
+ expat_libs="-lexpat" |
| 35 |
run_expat_test="yes" |
| 36 |
elif test "$expat_requested" = "yes"; then |
| 37 |
if test -n "$expat_include_dir" -a -n "$expat_lib_flags"; then |
| 38 |
@@ -126,6 +131,8 @@ |
| 39 |
saved_LDFLAGS="$LDFLAGS" |
| 40 |
LDFLAGS="$LDFLAGS $expat_lib_flags" |
| 41 |
|
| 42 |
+ saved_LIBS="$LIBSS" |
| 43 |
+ LIBS="$LIBS $expat_libs" |
| 44 |
dnl |
| 45 |
dnl Check Expat headers |
| 46 |
dnl |
| 47 |
@@ -171,7 +178,8 @@ |
| 48 |
]] |
| 49 |
)], |
| 50 |
[ |
| 51 |
EXPAT_LDFLAGS="$expat_lib_flags" |
| 52 |
+ EXPAT_LIBS="$expat_libs" |
| 53 |
expat_lib_found="yes" |
| 54 |
AC_MSG_RESULT([found]) |
| 55 |
], |
| 56 |
@@ -185,6 +193,7 @@ |
| 57 |
|
| 58 |
CPPFLAGS="$saved_CPPFLAGS" |
| 59 |
LDFLAGS="$saved_LDFLAGS" |
| 60 |
+ LIBS="$saved_LIBS" |
| 61 |
fi |
| 62 |
|
| 63 |
AC_MSG_CHECKING([for Expat XML Parser]) |
| 64 |
@@ -194,6 +203,7 @@ |
| 65 |
|
| 66 |
AC_SUBST([EXPAT_CFLAGS]) |
| 67 |
AC_SUBST([EXPAT_LDFLAGS]) |
| 68 |
+ AC_SUBST([EXPAT_LIBS]) |
| 69 |
|
| 70 |
HAVE_EXPAT="yes" |
| 71 |
else |
Archives