From: ddennedy Date: Sun, 28 Dec 2008 23:35:06 +0000 (+0000) Subject: swig/{java,python,tcl}/build: fix linking error __stack_chk_fail_local. X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=2bce409ea8875f5375b203d48ca9991bc1b38e7d;hp=d819f1cdd34e1bc2c78fb8b0efc6995b25978dcc;p=melted swig/{java,python,tcl}/build: fix linking error __stack_chk_fail_local. swig/python/play.py: fix syntax error reported by Jonathon Thomas. git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@1297 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/mlt++/swig/java/build b/mlt++/swig/java/build index e0ae212..0f8ba2e 100755 --- a/mlt++/swig/java/build +++ b/mlt++/swig/java/build @@ -21,7 +21,7 @@ then g++ -D_GNU_SOURCE -c -rdynamic -pthread -I../../src `pkg-config mlt-framework --cflags` mltpp_wrap.cxx $JAVA_INCLUDE || exit $? # Create the module - ld -shared mltpp_wrap.o -L../../src -lmlt++ -o libmltpp_java.so || exit $? + gcc -shared mltpp_wrap.o -L../../src -lmlt++ -o libmltpp_java.so || exit $? # Compile the test javac `find src_swig -name '*.java'` || exit $? diff --git a/mlt++/swig/python/build b/mlt++/swig/python/build index 7b980c3..7c7ff23 100755 --- a/mlt++/swig/python/build +++ b/mlt++/swig/python/build @@ -2,7 +2,7 @@ path=`which python 2> /dev/null` -if [ $? == 0 ] +if [ $? = 0 ] then # Change this as needed export PYTHON_INCLUDE=`python -c "import sys;print \"%s/include/python%d.%d\"%(sys.prefix,sys.version_info[0],sys.version_info[1])"` @@ -18,7 +18,7 @@ then g++ -fPIC -D_GNU_SOURCE -c -rdynamic -pthread `pkg-config mlt-framework --cflags` -I$PYTHON_INCLUDE mltpp_wrap.cxx || exit $? # Create the module - ld -shared mltpp_wrap.o -L../../src -lmlt++ -o _mltpp.so || exit $? + gcc -shared mltpp_wrap.o -L../../src -lmlt++ -o _mltpp.so || exit $? else echo Python not installed. exit 1 diff --git a/mlt++/swig/python/play.py b/mlt++/swig/python/play.py index ce45c7b..72116ae 100755 --- a/mlt++/swig/python/play.py +++ b/mlt++/swig/python/play.py @@ -6,7 +6,7 @@ import time import sys # Start the mlt system -mltpp.Factory.init( ) +mltpp.Factory().init( ) # Establish a profile profile = mltpp.Profile( ) diff --git a/mlt++/swig/tcl/build b/mlt++/swig/tcl/build index cb7cd63..4b2b32b 100755 --- a/mlt++/swig/tcl/build +++ b/mlt++/swig/tcl/build @@ -13,7 +13,7 @@ then g++ -D_GNU_SOURCE -c -rdynamic -pthread -I../../src `pkg-config mlt-framework --cflags` mltpp_wrap.cxx || exit 1 # Create the module - ld -shared mltpp_wrap.o -L../../src -lmlt++ -o mltpp.so || exit 1 + gcc -shared mltpp_wrap.o -L../../src -lmlt++ -o mltpp.so || exit 1 else echo "Unable to locate tclsh." exit 1