Mercurial Mercurial > sustaining > oi_151a > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6761802 RPATH/RUNPATH violation in SUNWxorg-graphics-ddx
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Wed, 02 Jun 2010 19:30:56 -0700
changeset 958 2cffb78ee7f7
parent 957 c2f4cfc53173
child 959 f937af013d20
6761802 RPATH/RUNPATH violation in SUNWxorg-graphics-ddx
open-src/driver/xf86-video-ati/Makefile file | annotate | diff | comparison | revisions
open-src/driver/xf86-video-glint/Makefile file | annotate | diff | comparison | revisions
open-src/driver/xf86-video-mga/Makefile file | annotate | diff | comparison | revisions
open-src/driver/xf86-video-nv/Makefile file | annotate | diff | comparison | revisions
open-src/driver/xf86-video-r128/Makefile file | annotate | diff | comparison | revisions
open-src/xserver/xorg/fbdevhw-path.patch file | annotate | diff | comparison | revisions
open-src/xserver/xorg/patch-list file | annotate | diff | comparison | revisions
packages/SUNWxorg-server/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxorg-server/prototype_i386 file | annotate | diff | comparison | revisions 
--- a/open-src/driver/xf86-video-ati/Makefile	Wed Jun 02 16:54:55 2010 -0700
+++ b/open-src/driver/xf86-video-ati/Makefile	Wed Jun 02 19:30:56 2010 -0700
@@ -65,7 +65,6 @@
 MODULE_LD_OPTIONS= \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
-	-L$(PROTODIR)$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-M $(PWD)/mapfile-bt829_drv-external \
 	-M $(PWD)/mapfile-fi1236_drv-external \
@@ -74,7 +73,6 @@
 	-M $(PWD)/mapfile-uda1380_drv-external \
 	-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
 	-R$(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
-	-R$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
 
 # Need to override install path for all the modules, not just ati_drv.so
--- a/open-src/driver/xf86-video-glint/Makefile	Wed Jun 02 16:54:55 2010 -0700
+++ b/open-src/driver/xf86-video-glint/Makefile	Wed Jun 02 19:30:56 2010 -0700
@@ -46,10 +46,8 @@
 # Libraries/modules to link with
 MODULE_LD_OPTIONS= \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-	-L$(PROTODIR)$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-	-R$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe \
 	-lvgahw -lxaa -lfbdevhw
--- a/open-src/driver/xf86-video-mga/Makefile	Wed Jun 02 16:54:55 2010 -0700
+++ b/open-src/driver/xf86-video-mga/Makefile	Wed Jun 02 19:30:56 2010 -0700
@@ -50,10 +50,8 @@
 # Libraries/modules to link with
 MODULE_LD_OPTIONS= \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-	-L$(PROTODIR)$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-	-R$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-lexa -lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe \
 	-lvgahw -lxaa -lfbdevhw
--- a/open-src/driver/xf86-video-nv/Makefile	Wed Jun 02 16:54:55 2010 -0700
+++ b/open-src/driver/xf86-video-nv/Makefile	Wed Jun 02 19:30:56 2010 -0700
@@ -46,9 +46,7 @@
 # Libraries/modules to link with
 MODULE_LD_OPTIONS= \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-	-L$(PROTODIR)$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-	-R$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-lexa -lfb -lint10 -lshadowfb -lXfont -lvbe -lvgahw -lxaa -lfbdevhw -lm \
 	-L$(PROTODIR)/usr/lib -lpciaccess
 
--- a/open-src/driver/xf86-video-r128/Makefile	Wed Jun 02 16:54:55 2010 -0700
+++ b/open-src/driver/xf86-video-r128/Makefile	Wed Jun 02 19:30:56 2010 -0700
@@ -51,11 +51,9 @@
 MODULE_LD_OPTIONS= \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
-	-L$(PROTODIR)$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
 	-R$(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
-	-R$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
 	-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-lint10 -lpciaccess -lfb -lvbe -lxaa -lfbdevhw -lvgahw
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/fbdevhw-path.patch	Wed Jun 02 19:30:56 2010 -0700
@@ -0,0 +1,32 @@
+From 0a4cc50c3e86104316e19e166737e2ad83fc38bb Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Wed, 2 Jun 2010 14:24:24 -0700
+Subject: [PATCH] Install fbdevhw module in normal module directory instead of linux/
+
+Since we no longer support OS-independent custom elfloader modules,
+we don't need to put the OS-dependent modules into os-specific subdirs
+any more.
+
+We do however still need to install the stubs version of this module
+on non-Linux platforms, since a number of drivers link to functions
+in it, even when built on non-Linux platforms.
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ hw/xfree86/fbdevhw/Makefile.am |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am
+index 0663525..76a69c1 100644
+--- a/hw/xfree86/fbdevhw/Makefile.am
++++ b/hw/xfree86/fbdevhw/Makefile.am
+@@ -1,5 +1,4 @@
+-linuxmoduledir = $(moduledir)/linux
+-linuxmodule_LTLIBRARIES = libfbdevhw.la
++module_LTLIBRARIES = libfbdevhw.la
+ 
+ libfbdevhw_la_LDFLAGS = -avoid-version
+ 
+-- 
+1.5.6.5
+
--- a/open-src/xserver/xorg/patch-list	Wed Jun 02 16:54:55 2010 -0700
+++ b/open-src/xserver/xorg/patch-list	Wed Jun 02 19:30:56 2010 -0700
@@ -1,5 +1,6 @@
 CreateNewResourceType.patch,-p1
 resource-names.patch,-p1
+fbdevhw-path.patch,-p1
 sun-paths.patch
 sun-extramodes.patch
 sun-manpage.patch
--- a/packages/SUNWxorg-server/prototype_com	Wed Jun 02 16:54:55 2010 -0700
+++ b/packages/SUNWxorg-server/prototype_com	Wed Jun 02 19:30:56 2010 -0700
@@ -64,6 +64,7 @@
 d none lib/xorg/modules						0755 root bin
 f none lib/xorg/modules/libexa.so				0755 root bin
 f none lib/xorg/modules/libfb.so				0755 root bin
+f none lib/xorg/modules/libfbdevhw.so				0755 root bin
 f none lib/xorg/modules/libint10.so				0755 root bin
 f none lib/xorg/modules/libshadow.so				0755 root bin
 f none lib/xorg/modules/libshadowfb.so				0755 root bin
--- a/packages/SUNWxorg-server/prototype_i386	Wed Jun 02 16:54:55 2010 -0700
+++ b/packages/SUNWxorg-server/prototype_i386	Wed Jun 02 19:30:56 2010 -0700
@@ -73,6 +73,7 @@
 d none lib/xorg/modules/amd64					0755 root bin
 f none lib/xorg/modules/amd64/libexa.so				0755 root bin
 f none lib/xorg/modules/amd64/libfb.so				0755 root bin
+f none lib/xorg/modules/amd64/libfbdevhw.so			0755 root bin
 f none lib/xorg/modules/amd64/libint10.so			0755 root bin
 f none lib/xorg/modules/amd64/libshadow.so			0755 root bin
 f none lib/xorg/modules/amd64/libshadowfb.so			0755 root bin
sustaining/oi_151a/xnv