[PULL] Kill libxorg
Peter Hutterer
peter.hutterer at who-t.net
Sun Jun 19 17:25:30 PDT 2011
On Fri, Jun 17, 2011 at 04:55:56PM -0700, Dan Nicholson wrote:
> Here's a few commits that kill off the libxorg "convenience library of
> convenience libraries". It provides a nice speedup when you're rebuilding
> Xorg from only a couple local changes.
Despite a distclean && reconf, I cannot make this link on my machine.
./../os/os.O: In function `AddEnabledDevice':
/home/whot/xorg/xserver/os/connection.c:1057: multiple definition of
`AddEnabledDevice'
./../os/os.O:/home/whot/xorg/xserver/os/connection.c:1057: first defined
here
./../os/os.O: In function `CreateWellKnownSockets':
/home/whot/xorg/xserver/os/connection.c:371: multiple definition of
`CreateWellKnownSockets'
./../os/os.O:/home/whot/xorg/xserver/os/connection.c:371: first defined
here
./../os/os.O: In function `AugmentSelf':
/home/whot/xorg/xserver/os/access.c:806: multiple definition of
`AugmentSelf'
./../os/os.O:/home/whot/xorg/xserver/os/access.c:806: first defined here
collect2: ld returned 1 exit status
there are approximately 2314 more of these, but I'll skip them for brevity.
Is this a problem on my side or a bug in the patchset?
Cheers,
Peter
>
> The following changes since commit 02d11af01211da55e9d93fe0e1851a0c6fe57472:
>
> Merge remote-tracking branch 'kibi/master' (2011-06-07 12:31:15 -0700)
>
> are available in the git repository at:
>
> git://people.freedesktop.org/~dbn/xserver.git no-libxorg
>
> Dan Nicholson (3):
> Don't use empty source files
> xfree86: Move sdksyms generation to ddx toplevel
> xfree86: Remove libxorg convenience library to speed up build
>
> dix/.gitignore | 1 -
> dix/Makefile.am | 6 +---
> hw/xfree86/.gitignore | 4 +-
> hw/xfree86/Makefile.am | 42 +++++++++++++++++++----------------
> hw/xfree86/loader/.gitignore | 3 --
> hw/xfree86/loader/Makefile.am | 14 +-----------
> hw/xfree86/os-support/.gitignore | 2 -
> hw/xfree86/os-support/Makefile.am | 7 +-----
> hw/xfree86/{loader => }/sdksyms.sh | 0
> os/.gitignore | 2 -
> os/Makefile.am | 6 +----
> test/.gitignore | 2 -
> test/Makefile.am | 12 ++++------
> 13 files changed, 35 insertions(+), 66 deletions(-)
> delete mode 100644 hw/xfree86/loader/.gitignore
> delete mode 100644 hw/xfree86/os-support/.gitignore
> rename hw/xfree86/{loader => }/sdksyms.sh (100%)
> delete mode 100644 os/.gitignore
More information about the xorg-devel
mailing list