summaryrefslogtreecommitdiff
path: root/devel/stlport
diff options
context:
space:
mode:
authorjlam <jlam>2004-11-12 06:39:19 +0000
committerjlam <jlam>2004-11-12 06:39:19 +0000
commit84a5a45c75e998d94c40f85c5e67ef62bd981c25 (patch)
treeddbacf3026d39d6b23e622ac51745a4f7db32d44 /devel/stlport
parent1f3c0a7f71e5f22757f741cdaede1a808025ffd1 (diff)
downloadpkgsrc-84a5a45c75e998d94c40f85c5e67ef62bd981c25.tar.gz
Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now that they're added
automatically by pthread.buildlink3.mk. Also, factor out the pthread library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS and use it in packages where necessary (usually the ones that don't have a GNU configure script).
Diffstat (limited to 'devel/stlport')
-rw-r--r--devel/stlport/Makefile3
-rw-r--r--devel/stlport/distinfo4
-rw-r--r--devel/stlport/patches/patch-aa8
3 files changed, 8 insertions, 7 deletions
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index db73701b6d9..048a3829c75 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: Makefile,v 1.20 2004/11/12 06:39:20 jlam Exp $
DISTNAME= STLport-4.6
PKGNAME= stlport-4.6
@@ -22,6 +22,7 @@ MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
MAKEFILE= gcc-libtool.mak
PTHREAD_OPTS+= require
+LDFLAGS+= ${PTHREAD_LIBS}
INCDIR= ${PREFIX}/include/stlport
LIBDIR= ${PREFIX}/lib
diff --git a/devel/stlport/distinfo b/devel/stlport/distinfo
index 1b1a2707e91..5219ad5cb3c 100644
--- a/devel/stlport/distinfo
+++ b/devel/stlport/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/01/05 22:14:18 mrauch Exp $
+$NetBSD: distinfo,v 1.7 2004/11/12 06:39:20 jlam Exp $
SHA1 (STLport-4.6.tar.gz) = 55401b648bebc0b7b6b4e3d7b4e420d22c358af9
Size (STLport-4.6.tar.gz) = 756708 bytes
-SHA1 (patch-aa) = 1fa541c702ac3edf67f9085343101fddd860409b
+SHA1 (patch-aa) = 9fb8af22933c925393bdcfb60988d100822501d7
SHA1 (patch-aj) = 67dd73dcf5a41dd2da38e58363a05f7f54709124
SHA1 (patch-ak) = ce55c80bc369bf9a8c20d751293197b71fbf4ed8
SHA1 (patch-al) = d8331d464c810ea8cdeba5cb3fe1e34dea707761
diff --git a/devel/stlport/patches/patch-aa b/devel/stlport/patches/patch-aa
index dc14b342b9c..aade90c03de 100644
--- a/devel/stlport/patches/patch-aa
+++ b/devel/stlport/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2004/01/05 22:14:18 mrauch Exp $
+$NetBSD: patch-aa,v 1.5 2004/11/12 06:39:20 jlam Exp $
--- src/gcc-libtool.mak.orig 2004-01-04 10:44:33.000000000 +0100
+++ src/gcc-libtool.mak
@@ -23,9 +23,9 @@ $NetBSD: patch-aa,v 1.4 2004/01/05 22:14:18 mrauch Exp $
+# guts for common stuff
+#
+#
-+LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o
++LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) -o
+# 2.95 flag
-+DYN_LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) $(PTHREAD_LDFLAGS) -rpath $(PREFIX)/lib -version-info $(VERSION_MAJOR):$(VERSION_MINOR) -shared -o
++DYN_LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) -rpath $(PREFIX)/lib -version-info $(VERSION_MAJOR):$(VERSION_MINOR) -shared -o
+
+OBJEXT=lo
+DYNEXT=la
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.4 2004/01/05 22:14:18 mrauch Exp $
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
+
-+CXXFLAGS_COMMON = ${CXXFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) -I${STLPORT_DIR} ${WARNING_FLAGS}
++CXXFLAGS_COMMON = ${CXXFLAGS} ${CPPFLAGS} -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2