Subject: pkg/29190: [patch] x11/gtk2/patches/patch-aa assumes -lpthread
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <xtoddx@gmail.com>
List: pkgsrc-bugs
Date: 02/01/2005 20:33:00
>Number: 29190
>Category: pkg
>Synopsis: [patch] x11/gtk2/patches/patch-aa assumes -lpthread
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Tue Feb 01 20:33:00 +0000 2005
>Originator: Todd Willey
>Release:
>Organization:
>Environment:
>Description:
x11/gtk2/patches/patch-aa adds -lpthread to compiler flags. I believe the correct behavior would be to pass in the thread linkage variable (BUILDLINK_LDFLAGS.pthread) from mk/pthread.builtin.mk to maintain platform neutrality.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- Makefile 12 Jan 2005 11:20:20 -0000 1.73
+++ Makefile 1 Feb 2005 20:28:49 -0000
@@ -69,6 +69,13 @@
USE_GNU_TOOLS+= awk
.endif
+post-patch:
+ ${MV} ${WRKSRC}/gdk-pixbuf/Makefile.in \
+ ${WRKSRC}/gdk-pixbuf/Makefile.in.in
+ ${SED} -e "s|@@PTHREAD_LINK@@|${BUILDLINK_LDFLAGS.pthread}|g" \
+ ${WRKSRC}/gdk-pixbuf/Makefile.in.in > \
+ ${WRKSRC}/gdk-pixbuf/Makefile.in
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/modules
${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/2.4.0/filesystems
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2/distinfo,v
retrieving revision 1.39
diff -u -r1.39 distinfo
--- distinfo 18 Jan 2005 12:06:37 -0000 1.39
+++ distinfo 1 Feb 2005 20:28:49 -0000
@@ -2,7 +2,7 @@
SHA1 (gtk+-2.6.1.tar.bz2) = a584abc1d43e68dc79ebfb9e5d09bd9aa1a77781
Size (gtk+-2.6.1.tar.bz2) = 11070668 bytes
-SHA1 (patch-aa) = ab8a71ffa3b44816bb6f53ced068f80132b67c09
+SHA1 (patch-aa) = 4efc6e2b2a2f4cd2e90e9bce165010bc800dc3ef
SHA1 (patch-ab) = 764729f9ee7e8b66e7165c34da0863b033af9552
SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
SHA1 (patch-ad) = dad88a4ee8bdac6bd3ea32b16ce4e0a3d1b202ab
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2/patches/patch-aa,v
retrieving revision 1.11
diff -u -r1.11 patch-aa
--- patches/patch-aa 4 Dec 2004 22:19:18 -0000 1.11
+++ patches/patch-aa 1 Feb 2005 20:28:49 -0000
@@ -7,7 +7,7 @@
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_LINK@@
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c