Bug 6628

Summary:

Fix broken Xephyr build in server-1-1-branch

Product:

xorg

Reporter:

Donnie Berkholz <dberkholz>

Component:

* Other

Assignee:

Xorg Project Team <xorg-team>

Status:

RESOLVED FIXED

QA Contact:

Severity:

normal

Priority:

high

Version:

git

Hardware:

x86 (IA32)

OS:

Linux (All)

Whiteboard:

i915 platform:

i915 features:

Bug Depends on:

Bug Blocks:

5041

Attachments:

Description	Flags
fix-kdrive-build.patch	none
wrap-sdk-headers.patch	none

Description Donnie Berkholz 2006-04-17 17:17:02 UTC

By moving the link order so libexa is linked before KDRIVE_LIBS, the
--enable-kdrive build is fixed.

This is already committed to HEAD in rev 1.8 of hw/kdrive/ephyr/Makefile.am --
see
http://webcvs.freedesktop.org/xorg/xserver/xorg/hw/kdrive/ephyr/Makefile.am?r1=1.7&r2=1.8

Comment 1 Donnie Berkholz 2006-04-17 17:24:18 UTC

Created attachment 5339 [details] [review]
fix-kdrive-build.patch

Comment 2 Donnie Berkholz 2006-04-17 17:26:12 UTC

Created attachment 5340 [details] [review]
wrap-sdk-headers.patch

Here is a highly relevant patch to avoid installing a couple of SDK headers for
non-Xorg servers. It's an update to airlied's commit a while back:

2006-01-18  Dave Airlie  <airlied@linux.ie>

    * Xext/Makefile.am:
    * dbe/Makefile.am:
    * fb/Makefile.am:
    * include/Makefile.am:
    * mi/Makefile.am:
    * miext/shadow/Makefile.am:
    * render/Makefile.am:
    Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg
    servers breaks.


I would appreciate if this could also be added to the 1-1 branch.

Comment 3 Adam Jackson 2006-04-18 04:59:17 UTC

+1, go ahead and commit this.

Comment 4 Donnie Berkholz 2006-04-18 10:26:00 UTC

Committed.

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.