| 1 |
gentoofan23 08/10/12 22:45:34 |
| 2 |
|
| 3 |
Added: opencv-1.0.0-swiginvalidlinkingoptions.patch |
| 4 |
Log: |
| 5 |
Fix problems when SWIG_PYTHON_LIBS was empty, resulting in '-L -o'. Reported by Blorby in bug #239563, patch stolen from Exherbo |
| 6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.25.9 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: opencv-1.0.0-swiginvalidlinkingoptions.patch |
| 15 |
=================================================================== |
| 16 |
--- opencv-1.0.0-orig/autotools/aclocal/swig_complete.m4 2006-07-18 07:45:24.000000000 +0000 |
| 17 |
+++ opencv-1.0.0/autotools/aclocal/swig_complete.m4 2008-09-13 17:57:48.000000000 +0000 |
| 18 |
@@ -163,7 +163,7 @@ |
| 19 |
if test x"$ac_version_at_least" = "xyes"; then |
| 20 |
SWIG_PYTHON_LIBS="" |
| 21 |
else |
| 22 |
- SWIG_PYTHON_LIBS="$SWIG_RUNTIME_LIBS_DIR -lswigpy" |
| 23 |
+ SWIG_PYTHON_LIBS="-L$SWIG_RUNTIME_LIBS_DIR -lswigpy" |
| 24 |
fi |
| 25 |
else |
| 26 |
AC_MSG_ERROR([SWIG version number unknown - cannot set python libs]) |
| 27 |
--- opencv-1.0.0-orig/interfaces/swig/python/Makefile.am 2006-08-10 13:29:20.000000000 +0000 |
| 28 |
+++ opencv-1.0.0/interfaces/swig/python/Makefile.am 2008-09-13 17:59:46.000000000 +0000 |
| 29 |
@@ -107,13 +107,13 @@ |
| 30 |
_cv_la_CXXFLAGS = $(PYTHON_CSPEC) |
| 31 |
_cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la |
| 32 |
_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \ |
| 33 |
- -L$(SWIG_PYTHON_LIBS) |
| 34 |
+ $(SWIG_PYTHON_LIBS) |
| 35 |
|
| 36 |
_highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \ |
| 37 |
highgui.i |
| 38 |
_highgui_la_CXXFLAGS = $(PYTHON_CSPEC) |
| 39 |
_highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la |
| 40 |
_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \ |
| 41 |
- -L$(SWIG_PYTHON_LIBS) |
| 42 |
+ $(SWIG_PYTHON_LIBS) |
| 43 |
|
| 44 |
endif |
Archives