open-src/driver/xf86-video-cirrus/mapfiles.patch
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Fri, 15 May 2009 09:36:46 -0700
changeset 705 24ca414edbff
parent 606 068c11b419c9
child 919 425233ae7236
permissions -rw-r--r--
6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] 6837131 Can't bring up dtlogin with AST2000 driver on nvx_114 Includes fix contributed by Juergen Keil for OpenSolaris Bug #8687: german keyboard layout: umlaut keys not accepted by Xvnc http://defect.opensolaris.org/bz/show_bug.cgi?id=8687

# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, and/or sell copies of the Software, and to permit persons
# to whom the Software is furnished to do so, provided that the above
# copyright notice(s) and this permission notice appear in all copies of
# the Software and that both the above copyright notice(s) and this
# permission notice appear in supporting documentation.
# 
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# 
# Except as contained in this notice, the name of a copyright holder
# shall not be used in advertising or otherwise to promote the sale, use
# or other dealings in this Software without prior written authorization
# of the copyright holder.

diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
--- src/Makefile.am	2008-03-19 07:29:23.000000000 -0700
+++ src/Makefile.am	2009-01-10 19:15:45.025364000 -0800
@@ -57,3 +57,41 @@ cirrus_laguna_la_SOURCES = \
          lg_i2c.c \
          lg_xaa.c \
          lg_xaa.h
+
+
+# Generate linker mapfiles for symbols found in other modules and use them
+# and library flag additions to make sure all symbols are resolvable
+
+MAPFILES = \
+	mapfile-cirrus_drv-external	 	\
+	mapfile-cirrus_alpine-external 	\
+	mapfile-cirrus_laguna-external
+
+BUILT_SOURCES = $(MAPFILES)
+
+cirrus_drv_la_LDFLAGS += \
+	-Wl,-M,mapfile-cirrus_alpine-external \
+	-Wl,-M,mapfile-cirrus_laguna-external \
+	-lint10 -lpciaccess -lvgahw -lvbe
+
+cirrus_alpine_la_LDFLAGS += \
+	-Wl,-M,mapfile-cirrus_drv-external \
+	-lfb -lint10 -lpciaccess -lshadowfb -lvgahw -lxaa
+
+cirrus_laguna_la_LDFLAGS += \
+	-Wl,-M,mapfile-cirrus_drv-external \
+	-lfb -lint10 -lpciaccess -lvgahw -lxaa
+
+mapfiles: $(MAPFILES)
+
+mapfile-cirrus_drv-external: $(cirrus_drv_la_OBJECTS)
+mapfile-cirrus_alpine-external: $(cirrus_alpine_la_OBJECTS)
+mapfile-cirrus_laguna-external: $(cirrus_laguna_la_OBJECTS)
+
+mapfile-%-external: 
+	-rm -f $@
+	printf '# Functions exported to loadable modules\n\n' > $@
+	printf '{\n  global:\n' >> $@
+	/usr/ccs/bin/nm -g $? | grep -v UNDEF | sed -n -e 's/^.*\|FUNC \|GLOB \|.*\|\(.*\)$$/    \1 = FUNCTION extern;/p' -e 's/^.*\|OBJT \|GLOB \|.*\|\(.*\)$$/    \1 = DATA extern;/p' >> $@
+	printf '};\n' >> $@
+