diff options
| author | jmmv <jmmv> | 2005-05-08 09:07:08 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2005-05-08 09:07:08 +0000 |
| commit | 2df6063cb1161b8c656ba789e50a1b93d878ecb8 (patch) | |
| tree | ad3a01d405f58b70e22b1d13cd1acb4222cdb190 | |
| parent | 3b92a14bd3b0e005bbd762160927416ff8d45829 (diff) | |
| download | pkgsrc-2df6063cb1161b8c656ba789e50a1b93d878ecb8.tar.gz | |
Use BUILDLINK_LDFLAGS.pthread rather than hardcoding -pthread in build
files for portability. Closes PR pkg/29190 by Todd Willey.
| -rw-r--r-- | x11/gtk2/Makefile | 8 | ||||
| -rw-r--r-- | x11/gtk2/distinfo | 4 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-aa | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index bd092039736..56290e3c31f 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2005/04/15 13:47:25 wiz Exp $ +# $NetBSD: Makefile,v 1.82 2005/05/08 09:07:08 jmmv Exp $ # DISTNAME= gtk+-2.6.7 @@ -54,6 +54,12 @@ PRINT_PLIST_AWK+= /^@dirrm share\/themes\/Default$$/ \ { print "@unexec $${RMDIR} %D/" $$2 \ " 2>/dev/null || $${TRUE}"; next; } +SUBST_CLASSES= pthread +SUBST_STAGE.pthread= pre-configure +SUBST_MESSAGE.pthread= "Fixing pthread flags." +SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g' +SUBST_FILES.pthread= gdk-pixbuf/Makefile.in + .include "../../mk/compiler.mk" # work around /**/ in a macro definition in X11/Xlibint.h (GetEmptyReq) diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index 24cb3f4d549..dd0593867c0 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.44 2005/04/15 13:47:25 wiz Exp $ +$NetBSD: distinfo,v 1.45 2005/05/08 09:07:08 jmmv Exp $ SHA1 (gtk+-2.6.7.tar.bz2) = 3a583ae6b468ded5dfcdc87cbd4f487d56b3e2c7 RMD160 (gtk+-2.6.7.tar.bz2) = c664442d779f7fd1668a0294aa66d687f34601e4 Size (gtk+-2.6.7.tar.bz2) = 11424614 bytes -SHA1 (patch-aa) = 586ddbb1aa39a3ddaf92687df3952a71312ce3e8 +SHA1 (patch-aa) = 4991da77c0d8ad79ca616c7e6d80449863725b00 SHA1 (patch-ac) = d9a47653b8db5ffae28dc233aea0dc15399eea79 SHA1 (patch-ad) = 1c93a494fa2040a1ec936cfd1fe31756b0fe3847 SHA1 (patch-ae) = 1fdeeef405b2045f26335f0bb607e3c3d24b3ae6 diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa index fcbb96bb954..075b01a3b3b 100644 --- a/x11/gtk2/patches/patch-aa +++ b/x11/gtk2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.13 2005/04/15 13:47:25 wiz Exp $ +$NetBSD: patch-aa,v 1.14 2005/05/08 09:07:08 jmmv Exp $ --- gdk-pixbuf/Makefile.in.orig 2005-04-12 22:31:06.000000000 +0200 +++ gdk-pixbuf/Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.13 2005/04/15 13:47:25 wiz Exp $ gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) -gdk_pixbuf_query_loaders_LDADD = $(LDADDS) -+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) -lpthread ++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) __PTHREAD_FLAGS__ gdk_pixbuf_query_loaders_SOURCES = queryloaders.c |