summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Anderson <gentoofan23@gentoo.org>2008-10-12 22:45:33 +0000
committerThomas Anderson <gentoofan23@gentoo.org>2008-10-12 22:45:33 +0000
commitadf88ec0b2e93070ed20afd19adacd0fcda0005f (patch)
tree9fcd187da2769ce86ec5434dda204e3fdf9374e8 /media-libs/opencv/files
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-adf88ec0b2e93070ed20afd19adacd0fcda0005f.tar.gz
gentoo-2-adf88ec0b2e93070ed20afd19adacd0fcda0005f.tar.bz2
gentoo-2-adf88ec0b2e93070ed20afd19adacd0fcda0005f.zip
Fix problems when SWIG_PYTHON_LIBS was empty, resulting in '-L -o'. Reported by Blorby in bug #239563, patch stolen from Exherbo
(Portage version: 2.2_rc12/cvs/Linux 2.6.25.9 x86_64)
Diffstat (limited to 'media-libs/opencv/files')
-rw-r--r--media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch b/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch
new file mode 100644
index 000000000000..02e100a4a0fa
--- /dev/null
+++ b/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch
@@ -0,0 +1,29 @@
+--- opencv-1.0.0-orig/autotools/aclocal/swig_complete.m4 2006-07-18 07:45:24.000000000 +0000
++++ opencv-1.0.0/autotools/aclocal/swig_complete.m4 2008-09-13 17:57:48.000000000 +0000
+@@ -163,7 +163,7 @@
+ if test x"$ac_version_at_least" = "xyes"; then
+ SWIG_PYTHON_LIBS=""
+ else
+- SWIG_PYTHON_LIBS="$SWIG_RUNTIME_LIBS_DIR -lswigpy"
++ SWIG_PYTHON_LIBS="-L$SWIG_RUNTIME_LIBS_DIR -lswigpy"
+ fi
+ else
+ AC_MSG_ERROR([SWIG version number unknown - cannot set python libs])
+--- opencv-1.0.0-orig/interfaces/swig/python/Makefile.am 2006-08-10 13:29:20.000000000 +0000
++++ opencv-1.0.0/interfaces/swig/python/Makefile.am 2008-09-13 17:59:46.000000000 +0000
+@@ -107,13 +107,13 @@
+ _cv_la_CXXFLAGS = $(PYTHON_CSPEC)
+ _cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la
+ _cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+- -L$(SWIG_PYTHON_LIBS)
++ $(SWIG_PYTHON_LIBS)
+
+ _highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \
+ highgui.i
+ _highgui_la_CXXFLAGS = $(PYTHON_CSPEC)
+ _highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la
+ _highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+- -L$(SWIG_PYTHON_LIBS)
++ $(SWIG_PYTHON_LIBS)
+
+ endif