head	1.4;
access;
symbols
	pkgsrc-2014Q1:1.3.0.4
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.2
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.1.0.6
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.4
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.2
	pkgsrc-2013Q1-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2014.04.01.21.21.28;	author wiz;	state dead;
branches;
next	1.3;
commitid	wKekMnvvsDolC1vx;

1.3
date	2013.10.30.23.53.10;	author wiz;	state Exp;
branches;
next	1.2;
commitid	nvaBSNLDva9ennbx;

1.2
date	2013.10.19.09.29.37;	author wiz;	state Exp;
branches;
next	1.1;
commitid	3cCHHBPf84lZWS9x;

1.1
date	2013.03.15.16.20.14;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update to 2.11.1:

I'm pleased to announce that we have a new release of fontconfig,
2.11.1 here now, which contains bug fixes.
@
text
@$NetBSD: patch-ba,v 1.3 2013/10/30 23:53:10 wiz Exp $

First chunk: part of the Solaris fix for test-migration.c, from
Akira TAGOH (upstream)

Second chunk: On NetBSD, it is not supported to load a library linked against
libpthread into a program that wasn't (since the C library provides
stubs for some pthread-functions, which might have already been called
before libpthread is loaded, leading to problems).

Since xdm (not linked against libpthread) might load fontconfig,
fontconfig shouldn't be linked against libpthread.

--- configure.orig	2013-01-10 08:59:05.000000000 +0000
+++ configure
@@@@ -13908,7 +13908,7 @@@@ $as_echo "#define HAVE_MMAP 1" >>confdef
 fi
 rm -f conftest.mmap conftest.txt
 
-for ac_func in link mkstemp mkostemp _mktemp_s getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat
+for ac_func in link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@@@ -15017,6 +15017,11 @@@@ case ${host_os} in
         darwin*)
         ax_pthread_flags="-pthread $ax_pthread_flags"
         ;;
+	netbsd*)
+	# use libc stubs, don't link against libpthread, to allow
+	# dynamic loading
+	ax_pthread_flags=""
+	;;
 esac
 
 if test x"$ax_pthread_ok" = xno; then

@


1.3
log
@Try fixing build on Solaris 10, from Akira TAGOH (upstream).
@
text
@d1 1
a1 1
$NetBSD: patch-ba,v 1.2 2013/10/19 09:29:37 wiz Exp $
@


1.2
log
@Fix typo in comment.
@
text
@d1 12
a12 1
$NetBSD: patch-ba,v 1.1 2013/03/15 16:20:14 drochner Exp $
d16 9
d37 1
@


1.1
log
@don't link against libpthread on NetBSD, to avoid problems with
xdm loading the library dynamically, reported by Takahiro Kambe
@
text
@d1 1
a1 1
$NetBSD$
d10 1
a10 1
+	# use libc stubs, don's link against libpthread, to allow
@