rpms/xorg-x11-server
6
0
Fork 0
Code Issues Pull Requests Releases Activity

* Fri Aug 07 2009 Dave Airlie <airlied@redhat.com> 1.6.99-30.20090807

Browse Source 
- goddamit: reapply picify libxf86config.a hopefully
This commit is contained in:
Dave Airlie 2009-08-07 11:37:15 +00:00
parent aa81af7baf
commit 1a6a35980a
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xorg-x11-server.spec
View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.6.99 Version: 1.6.99
Release: 29.%{gitdate}%{?dist} Release: 30.%{gitdate}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -46,6 +46,7 @@ Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
Source30: find-provides Source30: find-provides
#define __find_provides {nil} #define __find_provides {nil}
Patch5: xserver-1.4.99-pic-libxf86config.patch
Patch10: xserver-1.6.99-linkmap.patch Patch10: xserver-1.6.99-linkmap.patch
# airlied to upstream for 1.7 # airlied to upstream for 1.7
@ -513,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Aug 07 2009 Dave Airlie <airlied@redhat.com> 1.6.99-30.20090807
- goddamit: reapply picify libxf86config.a hopefully
* Fri Aug 07 2009 Dave Airlie <airlied@redhat.com> 1.6.99-29.20090807 * Fri Aug 07 2009 Dave Airlie <airlied@redhat.com> 1.6.99-29.20090807
- rebase upstream - rebase upstream
- libxf86config.a revenge, brought back .a upstream, doesn't work as .so - libxf86config.a revenge, brought back .a upstream, doesn't work as .so

19
xserver-1.4.99-pic-libxf86config.patch
View File

@ -1,25 +1,18 @@
From 6344659a33a7c192dffe6e796c771d02f78da5e5 Mon Sep 17 00:00:00 2001 From 4306b434038de7e2b17d3c4a6cfd87db469d3bda Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com> From: Adam Jackson <ajax@redhat.com>
Date: Thu, 1 Nov 2007 15:02:24 -0400 Date: Mon, 10 Dec 2007 11:26:57 -0500
Subject: [PATCH] Build libxf86config with -fPIC. Subject: [PATCH] Build libxf86config with -fPIC.
---
hw/xfree86/parser/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 849ee8b..0691158 100644 index b8fab28..ed831c9 100644
--- a/hw/xfree86/parser/Makefile.am --- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am
@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \ @@ -33,7 +33,7 @@ libxf86config_a_SOURCES = \
DRI.c \ $(INTERNAL_SOURCES)
Extensions.c libxf86config_a_CFLAGS = $(AM_CFLAGS)
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC -fvisibility=hidden +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC -fvisibility=hidden
EXTRA_DIST = \ EXTRA_DIST = \
Configint.h \ Configint.h \
--
1.5.3.4