pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/96f1b2963a60
branches: trunk
changeset: 483438:96f1b2963a60
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Nov 12 06:39:19 2004 +0000
description:
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:
audio/icecast1/Makefile | 4 +---
comms/gsmlib/Makefile | 4 +---
devel/glib/Makefile | 3 +--
devel/librfuncs/Makefile | 6 ++----
devel/physfs/Makefile | 4 +---
devel/stlport/Makefile | 3 ++-
devel/stlport/distinfo | 4 ++--
devel/stlport/patches/patch-aa | 8 ++++----
graphics/gd/Makefile | 3 +--
lang/guile/Makefile | 6 +-----
lang/guile14/Makefile | 6 +-----
misc/nxtvepg/Makefile | 4 ++--
misc/openoffice/distinfo | 4 ++--
misc/openoffice/patches/patch-ap | 8 ++++----
mk/pthread.buildlink3.mk | 3 +--
multimedia/libdv/Makefile | 3 +--
net/ORBit/Makefile | 8 +++++---
net/ORBit/distinfo | 4 ++--
net/ORBit/patches/patch-af | 11 +----------
net/aget/Makefile | 5 ++---
net/ettercap/Makefile | 4 ++--
net/gift-openft/Makefile | 4 +---
net/gift/Makefile | 4 +---
net/gkrellm-multiping/Makefile | 4 +---
net/gkrellm-multiping/distinfo | 4 ++--
net/gkrellm-multiping/patches/patch-aa | 6 +++---
net/kphone/distinfo | 4 ++--
net/kphone/patches/patch-af | 5 ++---
net/maradns/Makefile | 8 ++++----
x11/gtk2/Makefile | 3 +--
x11/gtk2/distinfo | 4 +---
x11/gtk2/patches/patch-aa | 13 -------------
x11/gtk2/patches/patch-ab | 13 -------------
x11/qt3-libs/Makefile.common | 3 ++-
x11/qt3-libs/files/qmake.conf | 6 +++---
x11/xfce4-mcs-manager/Makefile | 5 +----
x11/xfce4-panel/Makefile | 5 +----
x11/xosd/Makefile.common | 4 ++--
38 files changed, 66 insertions(+), 134 deletions(-)
diffs (truncated from 727 to 300 lines):
diff -r f56dd0f3d04d -r 96f1b2963a60 audio/icecast1/Makefile
--- a/audio/icecast1/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/audio/icecast1/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/12 06:39:19 jlam Exp $
#
DISTNAME= icecast-1.3.12
@@ -23,8 +23,6 @@
--sysconfdir=${PKG_SYSCONFDIR}
CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline
CPPFLAGS+= ${BUILDLINK_CPPFLAGS.${PYPACKAGE}}
-CFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= ${PTHREAD_LDFLAGS}
LDFLAGS+= ${BUILDLINK_LDFLAGS.${PYPACKAGE}}
LIBS+= -lutil
PTHREAD_OPTS+= require
diff -r f56dd0f3d04d -r 96f1b2963a60 comms/gsmlib/Makefile
--- a/comms/gsmlib/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/comms/gsmlib/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/11/12 00:04:52 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/12 06:39:20 jlam Exp $
#
DISTNAME= gsmlib-1.10
@@ -20,8 +20,6 @@
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --without-included-gettext
PTHREAD_OPTS+= require
-CFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= ${PTHREAD_LDFLAGS}
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r f56dd0f3d04d -r 96f1b2963a60 devel/glib/Makefile
--- a/devel/glib/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/devel/glib/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2004/10/05 12:12:57 minskim Exp $
+# $NetBSD: Makefile,v 1.75 2004/11/12 06:39:20 jlam Exp $
# FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
#
@@ -31,7 +31,6 @@
TEST_TARGET= check
PTHREAD_OPTS+= require
-CFLAGS.FreeBSD+= ${PTHREAD_CFLAGS}
.include "../../mk/bsd.prefs.mk"
diff -r f56dd0f3d04d -r 96f1b2963a60 devel/librfuncs/Makefile
--- a/devel/librfuncs/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/devel/librfuncs/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/11/08 11:10:00 shannonjr Exp $
+# $NetBSD: Makefile,v 1.7 2004/11/12 06:39:20 jlam Exp $
#
DISTNAME= librfuncs-1.0.5
@@ -18,12 +18,10 @@
TEST_TARGET= check
.include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
CONFIGURE_ARGS+= --disable-threads
.else
CONFIGURE_ARGS+= --enable-threads
-CFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= ${PTHREAD_LDFLAGS}
.endif
.include "../../mk/bsd.pkg.mk"
diff -r f56dd0f3d04d -r 96f1b2963a60 devel/physfs/Makefile
--- a/devel/physfs/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/devel/physfs/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:32 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/12 06:39:20 jlam Exp $
#
DISTNAME= physfs-1.0.0
@@ -16,8 +16,6 @@
GNU_CONFIGURE= yes
USE_GCC_SHLIB= yes
-CONFIGURE_ARGS+= LIBS="${PTHREAD_LDFLAGS}"
-
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff -r f56dd0f3d04d -r 96f1b2963a60 devel/stlport/Makefile
--- a/devel/stlport/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/devel/stlport/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -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 @@
MAKEFILE= gcc-libtool.mak
PTHREAD_OPTS+= require
+LDFLAGS+= ${PTHREAD_LIBS}
INCDIR= ${PREFIX}/include/stlport
LIBDIR= ${PREFIX}/lib
diff -r f56dd0f3d04d -r 96f1b2963a60 devel/stlport/distinfo
--- a/devel/stlport/distinfo Fri Nov 12 06:26:54 2004 +0000
+++ b/devel/stlport/distinfo Fri Nov 12 06:39:19 2004 +0000
@@ -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 -r f56dd0f3d04d -r 96f1b2963a60 devel/stlport/patches/patch-aa
--- a/devel/stlport/patches/patch-aa Fri Nov 12 06:26:54 2004 +0000
+++ b/devel/stlport/patches/patch-aa Fri Nov 12 06:39:19 2004 +0000
@@ -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 @@
+# 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 @@
+
+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
diff -r f56dd0f3d04d -r 96f1b2963a60 graphics/gd/Makefile
--- a/graphics/gd/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/graphics/gd/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2004/11/10 12:58:48 adam Exp $
+# $NetBSD: Makefile,v 1.61 2004/11/12 06:39:20 jlam Exp $
DISTNAME= gd-2.0.33
CATEGORIES= graphics
@@ -14,7 +14,6 @@
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
REPLACE_PERL= bdftogd
-LIBS+= ${PTHREAD_LDFLAGS}
BUILDLINK_DEPENDS.freetype2= freetype2>=2.1.4
diff -r f56dd0f3d04d -r 96f1b2963a60 lang/guile/Makefile
--- a/lang/guile/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/lang/guile/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2004/10/15 14:50:06 tv Exp $
+# $NetBSD: Makefile,v 1.57 2004/11/12 06:39:20 jlam Exp $
DISTNAME= guile-1.6.4
PKGREVISION= 4
@@ -23,10 +23,6 @@
TEST_DIRS= ${WRKSRC}
TEST_TARGET= check
-# Link the native thread so that Guile processes won't die when
-# libpthread.so is dl_open(3)'ed.
-CFLAGS+= ${PTHREAD_CFLAGS}
-
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
diff -r f56dd0f3d04d -r 96f1b2963a60 lang/guile14/Makefile
--- a/lang/guile14/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/lang/guile14/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/10/15 14:50:06 tv Exp $
+# $NetBSD: Makefile,v 1.21 2004/11/12 06:39:20 jlam Exp $
DISTNAME= guile-1.4.1
PKGNAME= guile14-1.4.1
@@ -22,10 +22,6 @@
BUILDLINK_PASSTHRU_DIRS= ${LOCALBASE}/guile/1.4
-# Link the native thread so that Guile processes won't die when libpthread.so
-# is dl_open(3)'ed.
-CFLAGS+= ${PTHREAD_CFLAGS}
-
.include "../../devel/libltdl/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff -r f56dd0f3d04d -r 96f1b2963a60 misc/nxtvepg/Makefile
--- a/misc/nxtvepg/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/misc/nxtvepg/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/10/03 00:13:00 tv Exp $
+# $NetBSD: Makefile,v 1.38 2004/11/12 06:39:20 jlam Exp $
DISTNAME= nxtvepg-2.6.0
PKGREVISION= 2
@@ -26,7 +26,7 @@
MAKE_ENV+= WANT_THREADS=1
.endif
# Required for Tcl/Tk 8.4
-LDFLAGS+= ${PTHREAD_LDFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
pre-configure:
cd ${WRKSRC}; \
diff -r f56dd0f3d04d -r 96f1b2963a60 misc/openoffice/distinfo
--- a/misc/openoffice/distinfo Fri Nov 12 06:26:54 2004 +0000
+++ b/misc/openoffice/distinfo Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2004/06/05 12:22:47 mrauch Exp $
+$NetBSD: distinfo,v 1.24 2004/11/12 06:39:20 jlam Exp $
SHA1 (openoffice-1.1.1/OOo_1.1.1p1_source.tar.bz2) = be2c5e799a33b70916528a6454297054db76328e
Size (openoffice-1.1.1/OOo_1.1.1p1_source.tar.bz2) = 192388698 bytes
@@ -41,7 +41,7 @@
SHA1 (patch-am) = 546afda0b6b5f223b5edf3933f769ab1064a46a2
SHA1 (patch-an) = e030f5ae1dd3ad2bcb5bab21684df2ed8eaf717e
SHA1 (patch-ao) = 68d21a0daf48d47c7a1ab398bb98c48d7f002c4e
-SHA1 (patch-ap) = 827d054cdcc243118a3011ddbed5bcc5bac09c24
+SHA1 (patch-ap) = 8f885c569f09ba3d66481e8d3b60238a50fd38bb
SHA1 (patch-aq) = 82285ade1af0a0c5e84d322d5a3a925c095103bb
SHA1 (patch-ar) = f185c705cda716e1b52e5b6ca6d9c5d2a9b341bc
SHA1 (patch-as) = 71d4d5a1517274ed9aff3e6c2bd89265772c93af
diff -r f56dd0f3d04d -r 96f1b2963a60 misc/openoffice/patches/patch-ap
--- a/misc/openoffice/patches/patch-ap Fri Nov 12 06:26:54 2004 +0000
+++ b/misc/openoffice/patches/patch-ap Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.3 2004/05/03 20:56:36 mrauch Exp $
+$NetBSD: patch-ap,v 1.4 2004/11/12 06:39:20 jlam Exp $
--- ../stlport/STLport-4.5.patch.orig 2004-04-17 20:08:34.000000000 +0200
+++ ../stlport/STLport-4.5.patch
@@ -19,8 +19,8 @@
+! #
+! # compiler
+! #
-+! CC+= $(PTHREAD_CFLAGS) -D_REENTRANT
-+! CXX+= $(PTHREAD_CFLAGS) -D_REENTRANT
++! CC+= -D_REENTRANT
++! CXX+= -D_REENTRANT
+!
+! #
+! # Basename for libraries
@@ -32,7 +32,7 @@
+! #
+! #
+! LINK=ar cr
-+! DYN_LINK=$(CXX) $(PTHREAD_LIBS) $(LDFLAGS) -fexceptions -shared -o
++! DYN_LINK=$(CXX) $(LDFLAGS) $(PTHREAD_LIBS) -fexceptions -shared -o
+!
+! OBJEXT=o
+! DYNEXT=so
diff -r f56dd0f3d04d -r 96f1b2963a60 mk/pthread.buildlink3.mk
--- a/mk/pthread.buildlink3.mk Fri Nov 12 06:26:54 2004 +0000
+++ b/mk/pthread.buildlink3.mk Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.14 2004/11/12 05:20:01 jlam Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.15 2004/11/12 06:39:20 jlam Exp $
#
# The pthreads strategy for pkgsrc is to "bless" a particular pthread
# package as the Official Pthread Replacement (OPR). A package that uses
@@ -171,7 +171,6 @@
PTHREAD_CFLAGS= ${BUILDLINK_CFLAGS.pthread}
PTHREAD_CFLAGS+= ${BUILDLINK_CPPFLAGS.pthread}
PTHREAD_LDFLAGS= ${BUILDLINK_LDFLAGS.pthread}
-PTHREAD_LDFLAGS+= ${PTHREAD_LIBS} # XXX This should be removed!
PTHREAD_LIBS= ${BUILDLINK_LIBS.pthread}
CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
CONFIGURE_ENV+= PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
diff -r f56dd0f3d04d -r 96f1b2963a60 multimedia/libdv/Makefile
--- a/multimedia/libdv/Makefile Fri Nov 12 06:26:54 2004 +0000
+++ b/multimedia/libdv/Makefile Fri Nov 12 06:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/12 06:39:20 jlam Exp $
Home |
Main Index |
Thread Index |
Old Index