svn commit: samba r12441 - branches/SAMBA_3_0/source/python trunk/source/python

gd at samba.org gd at samba.org
Thu Dec 22 22:15:54 GMT 2005


Author: gd
Date: 2005-12-22 22:15:52 +0000 (Thu, 22 Dec 2005)
New Revision: 12441

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12441

Log:
Fix python build.

Guenther

Modified:
   branches/SAMBA_3_0/source/python/setup.py
   trunk/source/python/setup.py


Changeset:
Modified: branches/SAMBA_3_0/source/python/setup.py
===================================================================
--- branches/SAMBA_3_0/source/python/setup.py	2005-12-22 22:03:25 UTC (rev 12440)
+++ branches/SAMBA_3_0/source/python/setup.py	2005-12-22 22:15:52 UTC (rev 12441)
@@ -63,8 +63,10 @@
         next_is_flag = 0;
     elif lib == "-Wl,-rpath":
         next_is_path = 1;
-    elif lib[0:2] in ("-l","-pthread"):
+    elif lib[0:2] in ("-l"):
         libraries.append(lib[2:])
+    elif lib[0:8] in ("-pthread"):
+        pass # Skip linker flags
     elif lib[0:2] == "-L":
         library_dirs.append(lib[2:])
     elif lib[0:2] in ("-W","-s"):

Modified: trunk/source/python/setup.py
===================================================================
--- trunk/source/python/setup.py	2005-12-22 22:03:25 UTC (rev 12440)
+++ trunk/source/python/setup.py	2005-12-22 22:15:52 UTC (rev 12441)
@@ -63,8 +63,10 @@
         next_is_flag = 0;
     elif lib == "-Wl,-rpath":
         next_is_path = 1;
-    elif lib[0:2] in ("-l","-pthread"):
+    elif lib[0:2] in ("-l"):
         libraries.append(lib[2:])
+    elif lib[0:8] in ("-pthread"):
+        pass # Skip linker flags
     elif lib[0:2] == "-L":
         library_dirs.append(lib[2:])
     elif lib[0:2] in ("-W","-s"):



More information about the samba-cvs mailing list