--- a/open-src/app/Makefile.inc Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/app/Makefile.inc Mon Jun 21 10:51:30 2010 -0700
@@ -39,11 +39,6 @@
MODTYPE_CXXFLAGS=$(PROG_CXXFLAGS)
MODTYPE_LDFLAGS=$(PROG_LDFLAGS)
-# Since so many app modules build against the currently private Xorg libXaw,
-# just set the flag here, so it's one place to maintain until we get the
-# libXaw mess straightened out
-MODTYPE_LD_OPTIONS = $(XAW_LD_OPTIONS)
-
# Set comments in ELF binaries to help identify versions/builds
MODTYPE_ADD_BUILD_TARGETS=set-elf-comments
--- a/open-src/app/installalias/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/app/installalias/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -2,7 +2,7 @@
#
# installalias module Makefile
#
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -48,12 +48,7 @@
MODULE_INSTALL_MAKEFLAGS=$(CONFIG_ENV) PREFIX=$(MODULE_PREFIX)
# Need to link with libXfont in server private directory
-MODULE_LDFLAGS= -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
-
-# Need to find libXfont in matching directory when used
-# in alternate root environments, like during OS install
-# $ORIGIN paths are relative to /usr/lib/X11, since that's where
-# installalias is installed
-MODULE_LD_OPTIONS= -R $$ORIGIN/../xorg$(ARCHLIBSUBDIR)
+MODULE_LDFLAGS= -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
+ -R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
include ../Makefile.inc
--- a/open-src/app/lbxproxy/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/app/lbxproxy/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -43,7 +43,4 @@
SUNTOUCH_MAN_FLAGS= \
-a '{Availability, SUNWxwplt} {Interface Stability, Committed}'
-# Find liblbxutil in private subdir
-MODULE_LDFLAGS= $(X11_SERVERLIBS_LDFLAGS)
-
include ../Makefile.inc
--- a/open-src/app/mkcookie/sun-src/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/app/mkcookie/sun-src/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,7 @@
CFLAGS1 = -DTCPCONN -DUNIXCONN -DIPv6
mkcookie: $(OBJS)
- $(LD) -o $@ $(CFLAGS) $(CFLAGS1) $(LDFLAGS) $(OBJS) -lX11 -lXau -lnsl
+ $(LD) -o $@ $(CFLAGS) $(CFLAGS1) $(LDFLAGS) $(OBJS) -lXau -lnsl
install: mkcookie
mkdir -p $(DESTDIR)$(PREFIX)/lib/X11
--- a/open-src/app/mkfontscale/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/app/mkfontscale/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -49,9 +49,4 @@
# Need to link with libfontenc in server private directory
MODULE_LDFLAGS= -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
-# Need to find libfontenc & libfreetype in matching directory when used
-# in alternate root environments, like during OS install
-MODULE_LD_OPTIONS= -R $$ORIGIN/../../sfw/lib$(ARCHLIBSUBDIR) \
- -R $$ORIGIN/../lib/X11/xserver$(ARCHLIBSUBDIR)
-
include ../Makefile.inc
--- a/open-src/common/Makefile.inc Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/common/Makefile.inc Mon Jun 21 10:51:30 2010 -0700
@@ -384,6 +384,7 @@
FIX_PC_OPS= \
-e 's|-L\$${libdir}|-L\$${libdir} -R\$${libdir}|;' \
+ -e 's|-R\$${libdir}( .*)? -R\$${libdir}|-R\$${libdir}$$1|g;' \
-e 's|Requires.private: .*$$||;' \
$(MODTYPE_FIX_PC_FLAGS) \
$(MODULE_FIX_PC_FLAGS)
--- a/open-src/common/Makefile.init Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/common/Makefile.init Mon Jun 21 10:51:30 2010 -0700
@@ -192,10 +192,14 @@
LIB_LDFLAGS_suncc = $(LIB_LDFLAGS_common)
PROG_LDFLAGS_suncc = $(PROG_LDFLAGS_common)
+# gcc requires additional library path for libgcc_s.so
+DEFAULT_LDFLAGS_gcc = -L/usr/sfw/lib$(ARCHLIBSUBDIR) \
+ -R/usr/sfw/lib$(ARCHLIBSUBDIR)
+
# Need to use -Wl,.. to pass linker flags through gcc
GCC_CONVERT_LDFLAGS_CMD=sed -e 's/-M /-Wl,-M,/g' -e 's/-B /-Wl,-B,/g'
GCC_LDFLAGS_CMD=echo $(LDFLAGS_common) | $(GCC_CONVERT_LDFLAGS_CMD)
-LDFLAGS_gcc=$(GCC_LDFLAGS_CMD:sh)
+LDFLAGS_gcc=$(GCC_LDFLAGS_CMD:sh) $(DEFAULT_LDFLAGS_gcc)
GCC_LIB_LDFLAGS_CMD=echo $(LIB_LDFLAGS_common) | $(GCC_CONVERT_LDFLAGS_CMD)
LIB_LDFLAGS_gcc=$(GCC_LIB_LDFLAGS_CMD:sh)
GCC_PROG_LDFLAGS_CMD=echo $(PROG_LDFLAGS_common) | $(GCC_CONVERT_LDFLAGS_CMD)
--- a/open-src/driver/Makefile.inc Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/Makefile.inc Mon Jun 21 10:51:30 2010 -0700
@@ -87,9 +87,7 @@
MODTYPE_CFLAGS_gcc_common = # -fvisibility=hidden - doesn't work with gcc 3.4.3
MODTYPE_CFLAGS += $(MODTYPE_CFLAGS_$(MODULE_COMPILER)_common)
-MODTYPE_LDFLAGS_suncc=
-MODTYPE_LDFLAGS_gcc=-R/usr/sfw/lib$(ARCHLIBSUBDIR)
-MODTYPE_LDFLAGS=$(LDFLAGS) -Wl,-B,direct $(MODTYPE_LDFLAGS_$(MODULE_COMPILER))
+MODTYPE_LDFLAGS=$(LDFLAGS) -Wl,-B,direct -R/lib$(ARCHLIBSUBDIR)
MODTYPE_LD_OPTIONS=-z defs $(X11_SERVERLIBS_LDFLAGS) \
-M $(TOP)/xserver/xorg/$(BUILD_DIR)/mapfile-Xorg-externs -lc
--- a/open-src/driver/xf86-video-ast/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-ast/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -54,9 +54,12 @@
MODULE_STABILITY=Volatile
# Libraries/modules to link with
+AST_LIBRARIES_sparc = # nothing extra
+AST_LIBRARIES_i386 = -lint10 -lpciaccess -lvbe -lvgahw
+AST_LIBRARIES = -lfb -lxaa $(AST_LIBRARIES_$(MACH))
MODULE_LD_OPTIONS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
- -lfb -lint10 -lpciaccess -lvbe -lvgahw -lxaa
+ $(AST_LIBRARIES)
include ../Makefile.inc
--- a/open-src/driver/xf86-video-chips/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-chips/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -53,7 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe -lvgahw -lxaa \
+ -lfb -lpciaccess -lshadowfb -lXfont -lvbe -lvgahw -lxaa \
-lxf8_16bpp
# Additional install rules beyond what upstream installs
--- a/open-src/driver/xf86-video-cirrus/mapfiles.patch Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-cirrus/mapfiles.patch Mon Jun 21 10:51:30 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -40,7 +40,7 @@
+cirrus_drv_la_LDFLAGS += \
+ -Wl,-M,mapfile-cirrus_alpine-external \
+ -Wl,-M,mapfile-cirrus_laguna-external \
-+ -lint10 -lpciaccess -lvgahw -lvbe
++ -lpciaccess -lvgahw -lvbe
+
+cirrus_alpine_la_LDFLAGS += \
+ -Wl,-M,mapfile-cirrus_drv-external \
@@ -48,7 +48,7 @@
+
+cirrus_laguna_la_LDFLAGS += \
+ -Wl,-M,mapfile-cirrus_drv-external \
-+ -lfb -lint10 -lpciaccess -lvgahw -lxaa
++ -lfb -lint10 -lvgahw -lxaa
+
+mapfiles: $(MAPFILES)
+
--- a/open-src/driver/xf86-video-glint/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-glint/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -54,7 +54,7 @@
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe \
- -lvgahw -lxaa -lfbdevhw
+ -lxaa -lfbdevhw
# Extra flags to pass to configure script
# - Disable DRI since the kernel module isn't ported
--- a/open-src/driver/xf86-video-i740/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-i740/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -51,7 +51,7 @@
MODULE_LD_OPTIONS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
- -lfb -lint10 -lpciaccess -lvbe -lvgahw -lxaa -lm
+ -lfb -lpciaccess -lvbe -lvgahw -lxaa -lm
# Additional install rules beyond what upstream installs
MODULE_ADD_INSTALL_TARGETS=install_docs
--- a/open-src/driver/xf86-video-intel/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-intel/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -55,16 +55,15 @@
MODULE_COMPILER_SET=yes
# Extra flags to pass to configure script
-MODULE_CONFIG_OPTS=--enable-dri
+# --libdir is needed to set path for XvMC libraries
+MODULE_CONFIG_OPTS=--enable-dri --libdir='$(X11_LIB_DIR)$(ARCHLIBSUBDIR)'
-# Libraries/modules to link with
+# Library paths at build time
MODULE_LD_OPTIONS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
- -R$(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
- -R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
+ -L$(PROTODIR)$(X11_LIB_DIR)$(ARCHLIBSUBDIR)
# Need to regenerate configure & Makefile.in's after patching
# configure.ac & Makefile.am's in libraries.patch & build-dri.patch
--- a/open-src/driver/xf86-video-intel/libraries.patch Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-intel/libraries.patch Mon Jun 21 10:51:30 2010 -0700
@@ -14,10 +14,11 @@
diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
--- src/Makefile.am 2009-02-28 12:28:53.000000000 -0800
+++ src/Makefile.am 2010-04-20 16:51:58.619438335 -0700
-@@ -38,6 +38,8 @@ intel_drv_la_LTLIBRARIES = intel_drv.la
+@@ -38,6 +38,9 @@
intel_drv_la_LDFLAGS = -module -avoid-version
intel_drv_ladir = @moduledir@/drivers
intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel
++intel_drv_la_LDFLAGS += -R $(moduledir) -R $(moduledir)/extensions
+intel_drv_la_LIBADD += -lfb -lextmod -lshadowfb -lXfont \
+ -lvbe -lvgahw -lxaa -lexa -ldri -ldri2 -lglx
if BUILD_UXA
--- a/open-src/driver/xf86-video-neomagic/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-neomagic/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -51,7 +51,7 @@
MODULE_LD_OPTIONS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
- -lfb -lint10 -lpciaccess -lshadow -lvbe -lvgahw -lxaa
+ -lfb -lpciaccess -lshadow -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-openchrome/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-openchrome/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -56,7 +56,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lshadow -lvbe \
+ -lfb -lint10 -lpciaccess -lvbe \
-lexa -lxaa -lvgahw -lshadowfb -lXfont -lm
include ../Makefile.inc
--- a/open-src/driver/xf86-video-rendition/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-rendition/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -53,7 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe -lvgahw -lxaa
+ -lfb -lint10 -lpciaccess -lshadowfb -lvbe -lvgahw -lxaa
# Additional install rules beyond what upstream installs
MODULE_ADD_INSTALL_TARGETS=install_docs
--- a/open-src/driver/xf86-video-s3/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-s3/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -51,6 +51,6 @@
MODULE_LD_OPTIONS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
- -lfb -lint10 -lpciaccess -lvbe -lvgahw -lxaa -lshadowfb -lXfont
+ -lfb -lint10 -lpciaccess -lvbe -lvgahw -lxaa -lshadowfb
include ../Makefile.inc
--- a/open-src/driver/xf86-video-s3virge/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-s3virge/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -53,7 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe -lvgahw -lxaa
+ -lfb -lpciaccess -lshadowfb -lvbe -lvgahw -lxaa
# Additional install rules beyond what upstream installs
MODULE_ADD_INSTALL_TARGETS=install_docs
--- a/open-src/driver/xf86-video-siliconmotion/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-siliconmotion/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -53,6 +53,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe -lvgahw -lxaa -lexa
+ -lfb -lint10 -lpciaccess -lXfont -lvbe -lvgahw -lxaa -lexa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-sis/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-sis/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -56,7 +56,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lexa -lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe -lvgahw -lxaa -lm
+ -lexa -lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe -lxaa -lm
# Additional install rules beyond what upstream installs
MODULE_ADD_INSTALL_TARGETS=install_docs
--- a/open-src/driver/xf86-video-vesa/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/driver/xf86-video-vesa/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -52,6 +52,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lshadow -lvbe
+ -lfb -lpciaccess -lshadow -lvbe
include ../Makefile.inc
--- a/open-src/font/util/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/font/util/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -37,5 +37,10 @@
FIX_PC_FILES = fontutil.pc.in
MODULE_ADD_UNINSTALLED_PC_OPS = -e 's|mapdir=|mapdir=$$protodir|g;'
+# Apply program flags, like app/*
+MODULE_CFLAGS=$(PROG_CFLAGS)
+MODULE_LDFLAGS=$(PROG_LDFLAGS)
+MODULE_ADD_BUILD_TARGETS=set-elf-comments
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/lib/DPS/sun-src/libdpstk/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/lib/DPS/sun-src/libdpstk/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -28,8 +28,8 @@
# Manual conversion of the X11R6.9 xc/lib/dpstk/Imakefile
LDPRELIB = -L . -L ../libdps -L ../libpsres
-DPSTKLIBS = $(LDPRELIB) -ldps -lXt -lX11 -lm -lc
-DPSTKXMLIBS = $(LDPRELIB) -ldpstk -lpsres -ldps -L/usr/dt/lib -lXm $(DPSTKLIBS)
+DPSTKLIBS = $(LDPRELIB) -ldps -lX11 -lm -lc
+DPSTKXMLIBS = $(LDPRELIB) -ldpstk -lpsres -ldps -L/usr/dt/lib -lXm -lXt $(DPSTKLIBS)
PSWRAP = ../pswrap/pswrap
--- a/open-src/lib/DPS/sun-src/pswrap/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/lib/DPS/sun-src/pswrap/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -31,7 +31,7 @@
CPPFLAGS += $(DEFINES)
YACC = /usr/ccs/bin/yacc
YFLAGS = -d
-EXTRA_LIBRARIES = -ll
+EXTRA_LIBRARIES = # -ll
SRCS = main.c pswdict.c pswfile.c \
systemnames.c psw.c pswstring.c pswsemantics.c
--- a/open-src/lib/Makefile.inc Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/lib/Makefile.inc Mon Jun 21 10:51:30 2010 -0700
@@ -41,11 +41,16 @@
$(MODULE_MTLEVEL_DEFAULT) MODULE_MTLEVEL=See XInitThreads(3X11)
MODTYPE_SUNTOUCH_MAN_FLAGS= -l $(LIBNAME) -a '{MT-Level, $(MODULE_MTLEVEL)}'
+# Add -lc to library link except for the handful of libraries that don't
+# need it
+LIBC_DEFAULT = $(NEED_LIBC:no=$(POUND_SIGN))
+$(LIBC_DEFAULT) LIBC=-lc
+
# Flags to build & link libraries with
MODTYPE_CPPFLAGS=$(LIB_CPPFLAGS)
MODTYPE_CFLAGS=$(LIB_CFLAGS)
MODTYPE_CXXFLAGS=$(LIB_CXXFLAGS)
-MODTYPE_LDFLAGS=$(LIB_LDFLAGS) -lc
+MODTYPE_LDFLAGS=$(LIB_LDFLAGS) $(LIBC)
MODTYPE_LD_OPTIONS=$(LIB_REQUIRED_LDFLAGS)
# Additional command line options to GNU autoconf configure script
--- a/open-src/lib/freetype/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/lib/freetype/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -69,6 +69,7 @@
# Additional command line options to GNU autoconf configure script
MODULE_CONFIG_OPTS= \
+ --libdir='$(MODULE_PREFIX)/lib$(ARCHLIBSUBDIR)' \
--with-zlib \
--with-pic
--- a/open-src/lib/libX11/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/lib/libX11/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -119,6 +119,8 @@
# -DSUNSOFT_KBD enables Solaris traditional keyboard handling
MODULE_CPPFLAGS = -DSUNSOFT -DMOTIFBC -DSUNSOFT_KBD
+MODULE_LDFLAGS = -R$(X11_LIB_DIR)$(ARCHLIBSUBDIR)
+
# Backwards compatibility for old paths until g11n moves all input methods
MODULE_CONFIG_ENV = \
XLOCALEDIR="/usr/share/X11/locale:/usr/X11/share/X11/locale" \
--- a/open-src/lib/libXaw5/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/lib/libXaw5/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -52,6 +52,6 @@
MODULE_CFLAGS += -I. -DHAS_ISW_FUNCS -DHAS_WCTYPE_H -DOLDXAW
# Link with version mapfile
-MODULE_LD_OPTIONS = -M $(PWD)/mapfile-vers
+MODULE_LDFLAGS = -R/usr/lib$(ARCHLIBSUBDIR) -M $(PWD)/mapfile-vers
include ../Makefile.inc
--- a/open-src/lib/libXevie/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/lib/libXevie/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -47,7 +47,8 @@
MODULE_STABILITY=Volatile
LIB_MAN_SUFFIX=3Xevie
-
+# libXevie actually doesn't call any libc functions
+NEED_LIBC=no
# pkg-config files that need to have -R added
FIX_PC_FILES=xevie.pc.in
--- a/open-src/lib/libXfont/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/lib/libXfont/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -63,16 +63,8 @@
# Need to link with libfontenc in server private directory
MODULE_LDFLAGS= -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
-# Need to find libfontenc & libfreetype in matching directory when used
-# in alternate root environments, like during OS install
-# We use sfw/lib to find libfreetype (via the compatibility link) and not
-# libc, which may be incompatible with the running system during Live Upgrade
-MODULE_LD_OPTIONS= -R $$ORIGIN -R $$ORIGIN/$(FREETYPE_RELATIVE_PATH)
-MODULE_BUILD_32_FLAGS= FREETYPE_RELATIVE_PATH=../../../../sfw/lib
-MODULE_BUILD_64_FLAGS= FREETYPE_RELATIVE_PATH=../../../../../sfw/lib$(ARCHLIBSUBDIR)
-
# Link with version mapfile
-MODULE_LD_OPTIONS += -M $(PWD)/mapfile-vers
+MODULE_LD_OPTIONS = -M $(PWD)/mapfile-vers
include ../Makefile.inc
--- a/open-src/lib/libXft/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/lib/libXft/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -49,14 +49,10 @@
MODULE_STABILITY=Volatile
LIB_MAN_SUFFIX=3
-# Paths to find libraries at build time (LD_LIBRARY_PATH)
-# and run time (LD_RUN_PATH) and freetype-config binary at build time (PATH)
-BUILD_ENV = LD_LIBRARY_PATH=$(PROTODIR)/usr/lib$(LIBSUBDIR):$(PROTODIR)/usr/openwin/lib$(LIBSUBDIR):/usr/sfw/lib$(LIBSUBDIR) LD_RUN_PATH=/usr/sfw/lib$(LIBSUBDIR) PATH=$(PROTODIR)/usr/bin$(LIBSUBDIR):$(PATH)
-MODULE_LD_OPTIONS= -L$(PROTODIR)/usr/lib$(LIBSUBDIR)
# Mapfile used to control which symbols are exported
XFT_MAPFILE=$(PWD)/mapfile.scope
-MODULE_LD_OPTIONS += -M$(XFT_MAPFILE) -lX11
+MODULE_LD_OPTIONS = -M$(XFT_MAPFILE)
# pkg-config files that need to have -R added
FIX_PC_FILES=xft.pc.in
--- a/open-src/xserver/Makefile.inc Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/xserver/Makefile.inc Mon Jun 21 10:51:30 2010 -0700
@@ -81,10 +81,6 @@
$(DPMS_DEFINES) -DSUNSOFT -DTSOL \
$(MODTYPE_CPPFLAGS_$(MODULE_COMPILER))
-XSERVER_LDFLAGS_suncc= # No extra flags needed
-XSERVER_LDFLAGS_gcc= -L/usr/sfw/lib$(ARCHLIBSUBDIR) \
- -R/usr/sfw/lib$(ARCHLIBSUBDIR)
-
# Environment variable options to GNU autoconf configure script
# - XSERVERCFLAGS_CFLAGS - force CFLAGS to avoid -I /usr/X11/include breaking
# use of headers from proto area
@@ -100,11 +96,13 @@
MODTYPE_CFLAGS=$(PROG_CFLAGS)
MODTYPE_CXXFLAGS=$(PROG_CXXFLAGS)
-MODTYPE_LDFLAGS=$(PROG_LDFLAGS) $(XSERVER_LDFLAGS_$(MODULE_COMPILER)) \
+MODTYPE_LDFLAGS=$(PROG_LDFLAGS)
+
+XSERVER_LDFLAGS = \
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) \
- -R$(X11_DIR)/lib$(ARCHLIBSUBDIR)
+ -R$(X11_LIB_DIR)$(ARCHLIBSUBDIR)
MODTYPE_BUILD_32_FLAGS=ARCHBINSUBDIR="$(SUBDIR32)"
--- a/open-src/xserver/xorg/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/xserver/xorg/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -82,6 +82,9 @@
MKFONTSCALE="$(MKFONTSCALE)" \
LD="$(CC) $(ARCH_FLAGS)"
+MODULE_LDFLAGS = $(XSERVER_LDFLAGS)
+MODULE_LD_OPTIONS = $(MAPFILES_FOR_ALL)
+
# pkg-config files that need to have -R added
FIX_PC_FILES=xorg-server.pc.in
# Remove compiler specific visibility flag that breaks builds of drivers
--- a/open-src/xserver/xorg/sun-src/tsol/Makefile.am Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/xserver/xorg/sun-src/tsol/Makefile.am Mon Jun 21 10:51:30 2010 -0700
@@ -1,6 +1,6 @@
#########################################################################
#
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -39,4 +39,4 @@
AM_CFLAGS = $(DIX_CFLAGS) $(TSOLPOLICYFILEDEF)
-libxtsol_la_LIBADD = -ltsol -ltsnet -lsecdb -lbsm
+libxtsol_la_LIBADD = -ltsol -ltsnet -lbsm
--- a/open-src/xserver/xvnc/Makefile Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/xserver/xvnc/Makefile Mon Jun 21 10:51:30 2010 -0700
@@ -173,19 +173,13 @@
CFLAGS_gcc += -fPIC
# Environment variable options to GNU autoconf configure script
-XVNC_CONFIG_ENV = LIBS="-lsocket -lnsl" \
- LDFLAGS="$(DEFAULT_CONFIG_LDFLAGS) $(MODTYPE_LDFLAGS) $(MODULE_LDFLAGS)"
-CONFIG_ENV += $(XVNC_CONFIG_ENV)
+# Have to remove CFLAGS entries from default LDFLAGS to avoid conflicts
+# with the C++ compiler we use instead
+VNC_CONFIG_ENV = $(CONFIG_ENV) LIBS="-lsocket -lnsl" \
+ LDFLAGS="$(DEFAULT_CONFIG_LDFLAGS) $(MODTYPE_LDFLAGS) $(MODULE_LDFLAGS)"
-LDPATH_ADDITIONS_sparc = \
- -L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) \
- -R$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR)
-LDPATH_ADDITIONS_i386 = \
- -L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) \
- -R$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR)
-LDPATH_ADDITIONS=$(LDPATH_ADDITIONS_$(MACH))
-
-MODULE_LDFLAGS = $(LDPATH_ADDITIONS)
+XVNC_CONFIG_ENV = $(CONFIG_ENV) \
+ LDFLAGS="$(DEFAULT_CONFIG_LDFLAGS) $(MODTYPE_LDFLAGS) $(XSERVER_LDFLAGS)"
# Needed by unix/xorg-x11-server-source/hw/vnc/Makefile.am to find libpixman
# headers in proto area after solaris-port.patch is applied
@@ -195,17 +189,17 @@
$(SOURCE_DIR)/unix/Makefile: $(SOURCE_TARGETS)
(cd $(SOURCE_DIR)/common && \
$(AUTORECONF_ENV) autoreconf --install --force && \
- $(CONFIG_ENV) $(SHELL) ./configure $(VNC_CONFIG_OPTS) )
+ $(VNC_CONFIG_ENV) $(SHELL) ./configure $(VNC_CONFIG_OPTS) )
(cd $(SOURCE_DIR)/unix && \
$(AUTORECONF_ENV) autoreconf --install --force && \
- $(CONFIG_ENV) $(SHELL) ./configure $(VNC_CONFIG_OPTS) )
+ $(VNC_CONFIG_ENV) $(SHELL) ./configure $(VNC_CONFIG_OPTS) )
# Run configure script for Xvnc
$(XORG_BUILD_DIR)/Makefile: $(SOURCE_TARGETS)
(cd $(XORG_BUILD_DIR) && \
$(AUTORECONF_ENV) autoreconf --install --force && \
- $(CONFIG_ENV) $(SHELL) ./configure $(XVNC_CONFIG_OPTS) )
+ $(XVNC_CONFIG_ENV) $(SHELL) ./configure $(XVNC_CONFIG_OPTS) )
Xvnc_build: $(CONFIGURE_TARGETS)
(cd $(SOURCE_DIR)/unix ; \
--- a/open-src/xserver/xvnc/solaris-port.patch Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/xserver/xvnc/solaris-port.patch Mon Jun 21 10:51:30 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -89,14 +89,15 @@
-I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir)
+if BUILD_TSOL_MODULE
-+TSOL_LIBS = ../../tsol/libxtsol.la -ltsol -ltsnet -lsecdb -lbsm
++TSOL_LIBS = ../../tsol/libxtsol.la -ltsol -ltsnet -lbsm
+endif
+
Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
+- $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11
+ -ljpeg -lz \
+ ../../IA/libIA.la \
+ $(TSOL_LIBS) \
- $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11
++ $(XSERVER_LIBS) $(XSERVER_SYS_LIBS)
Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
@@ -62,8 +69,8 @@ BUILT_SOURCES = $(nodist_Xvnc_SOURCES)