From 528a2c6d71eba53ac774f6947ff3f4077875bd41 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Sikora?= Date: Mon, 30 Jun 2008 10:02:28 +0000 Subject: [PATCH] - don't link with libstdc++ while using stlport. Changed files: stlport-config.in -> 1.4 stlport-debug.pc.in -> 1.4 stlport.pc.in -> 1.3 --- stlport-config.in | 6 +++--- stlport-debug.pc.in | 4 ++-- stlport.pc.in | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stlport-config.in b/stlport-config.in index e800933..c417835 100644 --- a/stlport-config.in +++ b/stlport-config.in @@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@ 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 @@ while test $# -gt 0; do echo @VERSION@ ;; --cflags) - includes="-I@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@libdir@ - echo $libdirs -lstlport -lpthread -lstdc++ -lm + echo -lc -nodefaultlibs $libdirs -lstlport ;; *) echo "${usage}" 1>&2 diff --git a/stlport-debug.pc.in b/stlport-debug.pc.in index 4870792..44b23a4 100644 --- a/stlport-debug.pc.in +++ b/stlport-debug.pc.in @@ -6,5 +6,5 @@ Name: STLport Description: SGI STLPort with debug support Version: @ver@ Requires: -Libs: -L@libdir@ -lstlportstlg -lpthread -lstdc++ -lm -Cflags: -I@includedir@/stlport -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +Libs: -nodefaultlibs -L@libdir@ -lc -lstlportstlg +Cflags: -pthread -D_STLP_DEBUG -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -isystem @includedir@/stlport diff --git a/stlport.pc.in b/stlport.pc.in index 500c22d..46bfef0 100644 --- a/stlport.pc.in +++ b/stlport.pc.in @@ -6,5 +6,5 @@ Name: STLport Description: SGI STLPort Version: @ver@ Requires: -Libs: -L@libdir@ -lstlport -lpthread -lstdc++ -lm -Cflags: -I@includedir@/stlport -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +Libs: -nodefaultlibs -L@libdir@ -lc -lstlport +Cflags: -pthread -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -isystem @includedir@/stlport -- 2.44.0