[gentoo-commits] gentoo-x86 commit in dev-python/pythonmagick/files: pythonmagick-0.9.10-Makefile.am.patch pythonmagick-0.9.10-ax_boost_python.patch

[gentoo-commits] gentoo-x86 commit in dev-python/pythonmagick/files: pythonmagick-0.9.10-Makefile.am.patch pythonmagick-0.9.10-ax_boost_python.patch

[Mike Gilbert (floppym)]

floppym     14/04/27 15:51:02

  Added:                pythonmagick-0.9.10-Makefile.am.patch
                        pythonmagick-0.9.10-ax_boost_python.patch
  Log:
  Version bump. Convert to python-r1, bug 508860 by Martin von Gagern. Use mirror://imagemagick in SRC_URI.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

Revision  Changes    Path
1.1                  dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch

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
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

Index: pythonmagick-0.9.10-Makefile.am.patch
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@
 _PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS)
 
 # And the libraries to include
-_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) -lboost_python $(MAGICKPP_LIBS) $(MAGICK_LIBS)
+_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) $(BOOST_PYTHON_LIB) $(MAGICKPP_LIBS) $(MAGICK_LIBS)
 
 EXTRA_DIST = autogen.pl SConstruct pyste_src LICENSE
 



1.1                  dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch

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
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

Index: pythonmagick-0.9.10-ax_boost_python.patch
===================================================================
--- a/m4/ax_boost_python.m4
+++ b/m4/ax_boost_python.m4
@@ -82,10 +82,11 @@
      ax_python_lib=$with_boost_python
      ax_boost_python_lib=boost_python-$with_boost_python
    fi])
-  BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-  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
-    AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break], , [$PYTHON_LDFLAGS])
-  done
+  LDFLAGS_SAVED="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+  export LDFLAGS
+  AC_CHECK_LIB($ax_python_lib, exit, [BOOST_PYTHON_LIB=-l$ax_python_lib], , [$PYTHON_LDFLAGS])
+  LDFLAGS="$LDFLAGS_SAVED"
   AC_SUBST(BOOST_PYTHON_LIB)
 fi
 ])dnl