components/x11/xorg-server/patches/16-dixmods-deps.patch

   1 --- a/hw/xfree86/Makefile.am    2017-02-02 07:34:36.117204752 -0800
   2 +++ b/hw/xfree86/Makefile.am    2017-02-02 07:35:26.842036982 -0800
   3 @@ -137,7 +137,7 @@
   4  EXTRA_DIST += sdksyms.sh
   5
   6  sdksyms.dep sdksyms.c: sdksyms.sh
   7 -       $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
   8 +       $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' SED='$(SED)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS) -I/usr/include -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/include/X11/dri
   9
  10  SDKSYMS_DEP = sdksyms.dep
  11  -include $(SDKSYMS_DEP)
  12 --- a/configure.ac      2017-02-02 07:40:40.357395126 -0800
  13 +++ b/configure.ac      2017-02-02 07:42:15.312782485 -0800
  14 @@ -247,6 +247,8 @@
  15  dnl Find the math libary, then check for cbrt function in it.
  16  AC_CHECK_LIB(m, sqrt)
  17  AC_CHECK_FUNCS([cbrt])
  18 +# But we don't want to link everything with libm
  19 +LIBS="${LIBS//-lm}"
  20
  21  AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
  22
  23 @@ -1764,6 +1766,7 @@
  24  XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB"
  25  XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
  26  XSERVER_SYS_LIBS="${XSERVER_SYS_LIBS} -lproject"
  27 +XSERVER_SYS_LIBS="${XSERVER_SYS_LIBS} -lm"
  28  AC_SUBST([XSERVER_LIBS])
  29  AC_SUBST([XSERVER_SYS_LIBS])
  30
  31 --- xorg-server-1.19.5/hw/xfree86/utils/cvt/Makefile.am.orig    2017-10-23 16:34:25.592472787 +0000
  32 +++ xorg-server-1.19.5/hw/xfree86/utils/cvt/Makefile.am 2017-10-23 16:34:42.983047274 +0000
  33 @@ -33,3 +33,5 @@
  34         $(top_srcdir)/os/xprintf.c
  35
  36  cvt_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
  37 +
  38 +cvt_LDADD = -lm