| 1 |
floppym 14/04/27 15:51:02 |
| 2 |
|
| 3 |
Added: pythonmagick-0.9.10-Makefile.am.patch |
| 4 |
pythonmagick-0.9.10-ax_boost_python.patch |
| 5 |
Log: |
| 6 |
Version bump. Convert to python-r1, bug 508860 by Martin von Gagern. Use mirror://imagemagick in SRC_URI. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: pythonmagick-0.9.10-Makefile.am.patch |
| 17 |
=================================================================== |
| 18 |
--- a/Makefile.am |
| 19 |
+++ b/Makefile.am |
| 20 |
@@ -27,7 +27,7 @@ |
| 21 |
_PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS) |
| 22 |
|
| 23 |
# And the libraries to include |
| 24 |
-_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) -lboost_python $(MAGICKPP_LIBS) $(MAGICK_LIBS) |
| 25 |
+_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) $(BOOST_PYTHON_LIB) $(MAGICKPP_LIBS) $(MAGICK_LIBS) |
| 26 |
|
| 27 |
EXTRA_DIST = autogen.pl SConstruct pyste_src LICENSE |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
1.1 dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch |
| 33 |
|
| 34 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch?rev=1.1&view=markup |
| 35 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch?rev=1.1&content-type=text/plain |
| 36 |
|
| 37 |
Index: pythonmagick-0.9.10-ax_boost_python.patch |
| 38 |
=================================================================== |
| 39 |
--- a/m4/ax_boost_python.m4 |
| 40 |
+++ b/m4/ax_boost_python.m4 |
| 41 |
@@ -82,10 +82,11 @@ |
| 42 |
ax_python_lib=$with_boost_python |
| 43 |
ax_boost_python_lib=boost_python-$with_boost_python |
| 44 |
fi]) |
| 45 |
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` |
| 46 |
- for ax_lib in `ls $BOOSTLIBDIR/libboost_python*.so* $BOOSTLIBDIR/libboost_python*.dylib* $BOOSTLIBDIR/libboost_python*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_python.*\)\.so.*$;\1;' -e 's;^lib\(boost_python.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_python.*\)\.a.*$;\1;' ` $ax_python_lib $ax_boost_python_lib boost_python; do |
| 47 |
- AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break], , [$PYTHON_LDFLAGS]) |
| 48 |
- done |
| 49 |
+ LDFLAGS_SAVED="$LDFLAGS" |
| 50 |
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" |
| 51 |
+ export LDFLAGS |
| 52 |
+ AC_CHECK_LIB($ax_python_lib, exit, [BOOST_PYTHON_LIB=-l$ax_python_lib], , [$PYTHON_LDFLAGS]) |
| 53 |
+ LDFLAGS="$LDFLAGS_SAVED" |
| 54 |
AC_SUBST(BOOST_PYTHON_LIB) |
| 55 |
fi |
| 56 |
])dnl |
Archives