SOURCES: stlport-config.in, stlport-debug.pc.in, stlport.pc.in - don't link...

pluto pluto at pld-linux.org
Mon Jun 30 12:02:33 CEST 2008


Author: pluto                        Date: Mon Jun 30 10:02:33 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- don't link with libstdc++ while using stlport.

---- Files affected:
SOURCES:
   stlport-config.in (1.3 -> 1.4) , stlport-debug.pc.in (1.3 -> 1.4) , stlport.pc.in (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/stlport-config.in
diff -u SOURCES/stlport-config.in:1.3 SOURCES/stlport-config.in:1.4
--- SOURCES/stlport-config.in:1.3	Fri May  2 15:59:01 2008
+++ SOURCES/stlport-config.in	Mon Jun 30 12:02:27 2008
@@ -5,7 +5,7 @@
 exec_prefix_set=yes
 
 usage="\
-Usage: stlport-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+Usage: stlport-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
 
 if test $# -eq 0; then
       echo "${usage}" 1>&2
@@ -39,12 +39,12 @@
       echo @VERSION@
       ;;
     --cflags)
-      includes="-I at includedir@/stlport -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 "
+      includes="-pthread -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -isystem @includedir@/stlport "
       echo $includes
       ;;
     --libs)
       libdirs=-L at libdir@
-      echo $libdirs -lstlport -lpthread -lstdc++ -lm
+      echo -lc -nodefaultlibs $libdirs -lstlport
       ;;
     *)
       echo "${usage}" 1>&2

================================================================
Index: SOURCES/stlport-debug.pc.in
diff -u SOURCES/stlport-debug.pc.in:1.3 SOURCES/stlport-debug.pc.in:1.4
--- SOURCES/stlport-debug.pc.in:1.3	Fri May  2 15:59:02 2008
+++ SOURCES/stlport-debug.pc.in	Mon Jun 30 12:02:27 2008
@@ -6,5 +6,5 @@
 Description: SGI STLPort with debug support
 Version: @ver@
 Requires:
-Libs: -L at libdir@ -lstlportstlg -lpthread -lstdc++ -lm
-Cflags: -I at includedir@/stlport -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+Libs: -nodefaultlibs -L at libdir@ -lc -lstlportstlg
+Cflags: -pthread -D_STLP_DEBUG -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -isystem @includedir@/stlport

================================================================
Index: SOURCES/stlport.pc.in
diff -u SOURCES/stlport.pc.in:1.2 SOURCES/stlport.pc.in:1.3
--- SOURCES/stlport.pc.in:1.2	Fri May  2 15:59:02 2008
+++ SOURCES/stlport.pc.in	Mon Jun 30 12:02:28 2008
@@ -6,5 +6,5 @@
 Description: SGI STLPort
 Version: @ver@
 Requires:
-Libs: -L at libdir@ -lstlport -lpthread -lstdc++ -lm
-Cflags: -I at includedir@/stlport -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+Libs: -nodefaultlibs -L at libdir@ -lc -lstlport
+Cflags: -pthread -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -isystem @includedir@/stlport
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/stlport-config.in?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/stlport-debug.pc.in?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/stlport.pc.in?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list