Changeset 4756

Timestamp:

Feb 21, 2014 7:49:37 AM (11 years ago)

Author:

nanang

Message:

More pjsua2 SWIG Python (re #1519): Separate library dependencies from Python Extension setting 'extra_link_args', so PJ lib dependencies are specified before Python's (otherwise strange crash happens on MinGW).

Location:

pjproject/trunk/pjsip-apps/src/swig/python

Files:

• helper.mak (modified) (1 diff)
• setup.py (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/swig/python/helper.mak

@@ -3 +3 @@
 
 ldflags:
-        @for token in `echo $(PJ_LDXXLIBS) $(PJ_LDXXFLAGS) $(LDFLAGS)`; do \
+        @for token in `echo $(PJ_LDXXFLAGS) $(LDFLAGS)`; do \
                 echo $$token; \
+        done
+
+libs:
+        @for token in `echo $(PJ_LDXXLIBS) $(LIBS)`; do \
+                echo $$token | grep \\-l | sed 's/-l//'; \
         done
 

pjproject/trunk/pjsip-apps/src/swig/python/setup.py

@@ -74 +74 @@
 f.close()
 
+# Fill in libraries
+libraries = []
+f = os.popen("make --no-print-directory -f helper.mak libs")
+for line in f:
+    libraries.append(line.rstrip("\r\n"))
+f.close()
+
 # Fill in extra_link_args
 extra_link_args = []
@@ -91 +98 @@
       url='http://www.pjsip.org',
       ext_modules = [Extension("_pjsua2", 
-                               ["pjsua2_wrap.cpp"], 
+                               ["pjsua2_wrap.cpp"],
+                               libraries=libraries,
                                extra_compile_args=extra_compile_args,
                                extra_link_args=extra_link_args