Tue Sep 20 11:31:13 2011 UTC ()
If building with threads support, add PTHREAD_LDFLAGS to LDFLAGS.

Fixes build on Ubuntu 11.04.  Unlikely to have an effect on platforms that
already built, so no PKGREVISION bump.

Ok'd in freeze by wiz@


(dsainty)
diff -r1.174 -r1.175 pkgsrc/lang/perl5/Makefile
cvs diff -r1.174 -r1.175 pkgsrc/lang/perl5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2011/09/17 18:51:35 1.174
+++ pkgsrc/lang/perl5/Makefile 2011/09/20 11:31:13 1.175
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.174 2011/09/17 18:51:35 brook Exp $ 1# $NetBSD: Makefile,v 1.175 2011/09/20 11:31:13 dsainty Exp $
2 2
3.include "license.mk" 3.include "license.mk"
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Practical Extraction and Report Language 6COMMENT= Practical Extraction and Report Language
7 7
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \ 10CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \
11 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \ 11 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \
12 p5-Tie-File-0.96{,nb*} \ 12 p5-Tie-File-0.96{,nb*} \
13 p5-Memoize-1.01{,nb*} \ 13 p5-Memoize-1.01{,nb*} \
14 p5-I18N-LangTags<0.35 \ 14 p5-I18N-LangTags<0.35 \
@@ -209,26 +209,27 @@ PKG_SUGGESTED_OPTIONS+= 64bitall @@ -209,26 +209,27 @@ PKG_SUGGESTED_OPTIONS+= 64bitall
209. else 209. else
210PKG_SUGGESTED_OPTIONS+= 64bitnone 210PKG_SUGGESTED_OPTIONS+= 64bitnone
211. endif 211. endif
212.else 212.else
213PKG_SUGGESTED_OPTIONS+= 64bitauto 213PKG_SUGGESTED_OPTIONS+= 64bitauto
214.endif 214.endif
215 215
216.include "../../mk/bsd.options.mk" 216.include "../../mk/bsd.options.mk"
217 217
218.if !empty(PKG_OPTIONS:Mthreads) 218.if !empty(PKG_OPTIONS:Mthreads)
219. include "../../mk/pthread.buildlink3.mk" 219. include "../../mk/pthread.buildlink3.mk"
220CONFIGURE_ARGS+= -Duseithreads 220CONFIGURE_ARGS+= -Duseithreads
221CFLAGS+= ${PTHREAD_CFLAGS} 221CFLAGS+= ${PTHREAD_CFLAGS}
 222LDFLAGS+= ${PTHREAD_LDFLAGS}
222LIBSWANTED+= ${PTHREAD_LIBS:M-l*:S/^-l//} 223LIBSWANTED+= ${PTHREAD_LIBS:M-l*:S/^-l//}
223. if ${OBJECT_FMT} == "XCOFF" 224. if ${OBJECT_FMT} == "XCOFF"
224PERL5_RPATH_THREAD=-thread 225PERL5_RPATH_THREAD=-thread
225. endif 226. endif
226.else 227.else
227CONFIGURE_ARGS+= -Uuseithreads 228CONFIGURE_ARGS+= -Uuseithreads
228. if ${OBJECT_FMT} == "XCOFF" 229. if ${OBJECT_FMT} == "XCOFF"
229PERL5_RPATH_THREAD= 230PERL5_RPATH_THREAD=
230. endif 231. endif
231.endif 232.endif
232 233
233.if !empty(PKG_OPTIONS:Mdebug) 234.if !empty(PKG_OPTIONS:Mdebug)
234CFLAGS+= -DDEBUGGING 235CFLAGS+= -DDEBUGGING