CVS commit: pkgsrc/x11/modular-xorg-server

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Jan 28 21:47:55 UTC 2017

Modified Files:
        pkgsrc/x11/modular-xorg-server: distinfo
        pkgsrc/x11/modular-xorg-server/patches: patch-configure

Log Message:
Fix xorg server build on NetBSD by force-passing configure checks.
pthread seems needed for configure checks only.

PR pkg/51646


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/x11/modular-xorg-server/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.80 pkgsrc/x11/modular-xorg-server/distinfo:1.81
--- pkgsrc/x11/modular-xorg-server/distinfo:1.80        Thu Jan 12 00:26:35 2017
+++ pkgsrc/x11/modular-xorg-server/distinfo     Sat Jan 28 21:47:55 2017
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.80 2017/01/12 00:26:35 wiz Exp $
+$NetBSD: distinfo,v 1.81 2017/01/28 21:47:55 maya Exp $
 
 SHA1 (xorg-server-1.19.1.tar.bz2) = 13c81e0ebb6ac1359a611d0503805c6dc0315477
 RMD160 (xorg-server-1.19.1.tar.bz2) = 6434b1b6946a84ba5a829556ea8cfdf60a510863
 SHA512 (xorg-server-1.19.1.tar.bz2) = 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
 Size (xorg-server-1.19.1.tar.bz2) = 6041792 bytes
-SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2
+SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
 SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 896825ba12646431cba603938d118acbdde305dd
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a

Index: pkgsrc/x11/modular-xorg-server/patches/patch-configure
diff -u pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.3 pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.4
--- pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.3  Mon Jun 29 11:12:45 2015
+++ pkgsrc/x11/modular-xorg-server/patches/patch-configure      Sat Jan 28 21:47:55 2017
@@ -1,11 +1,13 @@
-$NetBSD: patch-configure,v 1.3 2015/06/29 11:12:45 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2017/01/28 21:47:55 maya Exp $
 
 Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
 (c.f. patch-hw_xfree86_os-support_bsd_i386.c)
 
+for netbsd, force pass pthread configure checks (pthread not needed)
+
 --- configure.orig     2015-02-10 22:49:52.000000000 +0000
 +++ configure
-@@ -22680,7 +22680,7 @@ $as_echo "#define USE_DEV_IO 1" >>confde
+@@ -23235,7 +23235,7 @@ $as_echo "#define USE_DEV_IO 1" >>confde
  $as_echo "#define USE_DEV_IO 1" >>confdefs.h
   ;;
                *netbsd*)
@@ -14,3 +16,13 @@ Use USE_AMD64_IOPL (actually x86_64_iopl
  
                                SYS_LIBS=-lx86_64
                                ;;
+@@ -25079,7 +25079,8 @@ case ${host_os} in
+       netbsd*)
+       # use libc stubs, don't link against libpthread, to allow
+       # dynamic loading
+-      ax_pthread_flags=""
++      ax_pthread_flags="none"
++      ax_pthread_ok="yes"
+       ;;
+ esac
+