diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-05-13 20:01:09 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-05-13 20:01:09 +0000 |
| commit | b885b552e957f1d142535811cf10de4fd0156a09 (patch) | |
| tree | c3c50e27dc008a2b28a147b8a241cf6e12c698d1 | |
| parent | 96cb3b82ba075f0abb881c4949e2845d82e64021 (diff) | |
| download | aports-b885b552e957f1d142535811cf10de4fd0156a09.tar.bz2 aports-b885b552e957f1d142535811cf10de4fd0156a09.tar.xz | |
x11/xorg-server: build without -z now linker flag
The dlloader does not work with the default hardened -z now linker
flag. There seems to b no way to forward linker flags to the modules
so we implement gentoo-style GCC_SPECS to turn off the linker flag.
| -rw-r--r-- | x11/xorg-server/APKBUILD | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/x11/xorg-server/APKBUILD b/x11/xorg-server/APKBUILD index d38a71a5e1..ed27fbaebe 100644 --- a/x11/xorg-server/APKBUILD +++ b/x11/xorg-server/APKBUILD @@ -1,12 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server pkgver=1.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" license="custom" subpackages="$pkgname-dev $pkgname-doc xfbdev" depends=" + font-misc-misc + font-cursor-misc libpciaccess libx11 libxdamage @@ -19,6 +21,9 @@ depends=" pixman uclibc libgcc + xkeyboard-config + xkbcomp + xinit " makedepends=" libpciaccess-dev @@ -61,6 +66,12 @@ depends_dev="pixman-dev libpciaccess-dev" build () { cd "$srcdir"/$pkgname-$pkgver + # xorg modules does not work with the -z now and it seems like we + # cannot pass over the linker flag to .so files. so we tweak the + # gcc specs. + ${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs + export GCC_SPECS="$srcdir"/gcc-specs + ./configure --prefix=/usr \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ @@ -72,8 +83,6 @@ build () { --enable-ipv6 \ --enable-xfbdev \ --enable-kdrive \ - --enable-kdrive-vesa \ - --enable-randr \ --enable-xorg \ --enable-xv \ --enable-xres \ @@ -83,19 +92,16 @@ build () { --disable-config-hal \ --disable-dmx \ --disable-glx \ - --disable-glx-tsl \ --disable-tslib \ --disable-xfree86-utils \ --disable-xinerama \ --disable-xnest \ - --disable-xorgcfg \ --disable-xsdl \ --disable-aiglx \ --disable-xvmc \ --disable-screensaver \ --disable-xinerama \ --disable-xace \ - --disable-dbe \ || return 1 # --enable-xnest \ |