commit 1e05f6ce475bc5dc76425fd7d6abe226650e325d parent e7427827f4511e53965fa232885ced422cef4259 Author: sin <sin@2f30.org> Date: Fri, 6 Jun 2014 14:59:00 +0000 Fix libdrm and xorgvideointel Diffstat:
| M | xorglibdrm/depsinc.mk | | | 3 | ++- |
| M | xorglibdrm/xorglibdrm.mk | | | 3 | ++- |
| M | xorgvideointel/xorgvideointel.mk | | | 2 | +- |
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/xorglibdrm/depsinc.mk b/xorglibdrm/depsinc.mk @@ -2,5 +2,6 @@ xorglibdrm_libdir = $xorglibdrm_DEPDIR/libdrm-$v/lib/lib xorglibdrm_includedir = $xorglibdrm_DEPDIR/libdrm-$v/lib/include -DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibdrm_includedir} +xorglibdrm_includedrmdir = $xorglibdrm_DEPDIR/libdrm-$v/lib/include/libdrm +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibdrm_includedir} -I${xorglibdrm_includedrmdir} DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorglibdrm_libdir} -ldrm diff --git a/xorglibdrm/xorglibdrm.mk b/xorglibdrm/xorglibdrm.mk @@ -6,12 +6,13 @@ DEPS = libpthreadstubs xorglibpciaccess xorglibdrm:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export PTHREADSTUBS_CFLAGS="${CFLAGS}" + export PTHREADSTUBS_LIBS="${LDFLAGS}" export PCIACCESS_CFLAGS="${CFLAGS}" export PCIACCESS_LIBS="${LDFLAGS}" CC="$CC" ./configure \ --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ - --disable-libkms \ --disable-nouveau \ --disable-vmwgfx \ --disable-shared \ diff --git a/xorgvideointel/xorgvideointel.mk b/xorgvideointel/xorgvideointel.mk @@ -1,5 +1,5 @@ TARG = xorgvideointel -DEPS = xorgserver xorgprotoall xorglibpixman xorglibpciaccess +DEPS = xorgserver xorgprotoall xorglibpixman xorglibpciaccess xorglibdrm <$mkbuild/mk.common-noinst