162 lines
4.9 KiB
Plaintext
162 lines
4.9 KiB
Plaintext
$NetBSD: patch-configure,v 1.5 2016/02/12 11:49:53 tnn Exp $
|
|
|
|
Add libdevq support from FreeBSD ports.
|
|
|
|
--- configure.orig 2016-01-13 10:48:25.000000000 +0000
|
|
+++ configure
|
|
@@ -860,6 +860,8 @@ GLPROTO_LIBS
|
|
GLPROTO_CFLAGS
|
|
XLIBGL_LIBS
|
|
XLIBGL_CFLAGS
|
|
+LIBDEVQ_LIBS
|
|
+LIBDEVQ_CFLAGS
|
|
LIBUDEV_LIBS
|
|
LIBUDEV_CFLAGS
|
|
ENABLE_SHADER_CACHE_FALSE
|
|
@@ -1174,6 +1176,8 @@ OPENSSL_CFLAGS
|
|
OPENSSL_LIBS
|
|
LIBUDEV_CFLAGS
|
|
LIBUDEV_LIBS
|
|
+LIBDEVQ_CFLAGS
|
|
+LIBDEVQ_LIBS
|
|
XLIBGL_CFLAGS
|
|
XLIBGL_LIBS
|
|
GLPROTO_CFLAGS
|
|
@@ -5287,6 +5291,7 @@ DRI2PROTO_REQUIRED=2.6
|
|
DRI3PROTO_REQUIRED=1.0
|
|
PRESENTPROTO_REQUIRED=1.0
|
|
LIBUDEV_REQUIRED=151
|
|
+LIBDEVQ_REQUIRED=0.0.2
|
|
GLPROTO_REQUIRED=1.4.14
|
|
LIBOMXIL_BELLAGIO_REQUIRED=0.0
|
|
LIBVA_REQUIRED=0.38.0
|
|
@@ -20727,7 +20732,7 @@ _ACEOF
|
|
$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
|
|
flag=no
|
|
case ${host_os} in
|
|
- aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
|
|
+ aix* | freebsd* | dragonfly* | darwin*) flag="-D_THREAD_SAFE";;
|
|
osf* | hpux*) flag="-D_REENTRANT";;
|
|
solaris*)
|
|
if test "$GCC" = "yes"; then
|
|
@@ -22087,6 +22092,89 @@ else
|
|
fi
|
|
|
|
|
|
+
|
|
+# Check for libdevq
|
|
+
|
|
+pkg_failed=no
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5
|
|
+$as_echo_n "checking for LIBDEVQ... " >&6; }
|
|
+if test -n "$LIBDEVQ_CFLAGS"; then
|
|
+ pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS"
|
|
+ elif test -n "$PKG_CONFIG"; then
|
|
+ if test -n "$PKG_CONFIG" && \
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
|
|
+ --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
+ pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0 >=
|
|
+ $LIBDEVQ_REQUIRED" 2>/dev/null`
|
|
+ test "x$?" != "x0" && pkg_failed=yes
|
|
+else
|
|
+ pkg_failed=yes
|
|
+fi
|
|
+ else
|
|
+ pkg_failed=untried
|
|
+fi
|
|
+if test -n "$LIBDEVQ_LIBS"; then
|
|
+ pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS"
|
|
+ elif test -n "$PKG_CONFIG"; then
|
|
+ if test -n "$PKG_CONFIG" && \
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
|
|
+ --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
+ pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0 >=
|
|
+ $LIBDEVQ_REQUIRED" 2>/dev/null`
|
|
+ test "x$?" != "x0" && pkg_failed=yes
|
|
+else
|
|
+ pkg_failed=yes
|
|
+fi
|
|
+ else
|
|
+ pkg_failed=untried
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+if test $pkg_failed = yes; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+
|
|
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
+ _pkg_short_errors_supported=yes
|
|
+else
|
|
+ _pkg_short_errors_supported=no
|
|
+fi
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
+ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors
|
|
+ --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED"
|
|
+ 2>&1`
|
|
+ else
|
|
+ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
|
|
+ --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
|
|
+ fi
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
+ echo "$LIBDEVQ_PKG_ERRORS" >&5
|
|
+
|
|
+ have_libdevq=no
|
|
+elif test $pkg_failed = untried; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+ have_libdevq=no
|
|
+else
|
|
+ LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS
|
|
+ LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+ have_libdevq=yes
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
if test "x$enable_dri" = xyes; then
|
|
if test "$enable_static" = yes; then
|
|
as_fn_error $? "Cannot use static libraries for DRI drivers" "$LINENO" 5
|
|
@@ -22889,6 +22977,10 @@ if test "$have_sysfs" = yes; then
|
|
DEFINES="$DEFINES -DHAVE_SYSFS"
|
|
have_pci_id=yes
|
|
fi
|
|
+if test "$have_libdevq" = yes; then
|
|
+ DEFINES="$DEFINES -DHAVE_LIBDEVQ"
|
|
+ have_pci_id=yes
|
|
+fi
|
|
|
|
# This is outside the case (above) so that it is invoked even for non-GLX
|
|
# builds.
|
|
@@ -23821,6 +23913,8 @@ fi
|
|
|
|
if test "x$need_pci_id$have_libudev" = xyesyes; then
|
|
GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED"
|
|
+elif test "x$need_libdevq" = xyes; then
|
|
+ GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED"
|
|
else
|
|
GBM_PC_REQ_PRIV=""
|
|
fi
|
|
@@ -25468,9 +25562,6 @@ fi
|
|
CLANG_LIBDIR=${LLVM_LIBDIR}
|
|
fi
|
|
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
|
|
- if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
|
|
- as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5
|
|
-fi
|
|
fi
|
|
else
|
|
MESA_LLVM=0
|