[PATCH 3/3] xfree86: Link modules with -module

Jamey Sharp jamey at minilop.net
Thu Sep 15 00:23:31 PDT 2011 

On Wed, Sep 14, 2011 at 08:17:45PM -0500, Jeremy Huddleston wrote:
> This makes a difference on darwin (and apparently nowhere else)
> 
> Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
> ---

According to the libtool manual, "modules that can be dlopened" need
libtool's -module switch. So I think this patch is the right thing to do
even if it doesn't make any difference on the platforms that already
supported the xfree86 DDX.

https://www.gnu.org/s/libtool/manual/libtool.html#Modules-for-libltdl

Therefore:

Reviewed-by: Jamey Sharp <jamey at minilop.net>

But I'd also like to hear from Gaetan or somebody on this as well.

Jamey

>  hw/xfree86/dixmods/Makefile.am        |   12 ++++++------
>  hw/xfree86/dixmods/extmod/Makefile.am |    2 +-
>  hw/xfree86/exa/Makefile.am            |    2 +-
>  hw/xfree86/fbdevhw/Makefile.am        |    2 +-
>  hw/xfree86/ramdac/Makefile.am         |    1 +
>  hw/xfree86/shadowfb/Makefile.am       |    2 +-
>  hw/xfree86/vbe/Makefile.am            |    2 +-
>  hw/xfree86/xaa/Makefile.am            |    2 +-
>  8 files changed, 13 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
> index 1a162ab..b6eb54f 100644
> --- a/hw/xfree86/dixmods/Makefile.am
> +++ b/hw/xfree86/dixmods/Makefile.am
> @@ -30,21 +30,21 @@ INCLUDES = @XORG_INCS@ \
>             -I$(top_srcdir)/miext/shadow \
>             -I$(top_srcdir)/glx
>  
> -libdbe_la_LDFLAGS = -avoid-version
> +libdbe_la_LDFLAGS = -module -avoid-version
>  libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
>  libdbe_la_SOURCES = dbemodule.c
>  
> -libfb_la_LDFLAGS = -avoid-version
> +libfb_la_LDFLAGS = -module -avoid-version
>  libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
>  libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
>  libfb_la_CFLAGS = $(AM_CFLAGS)
>  
> -libwfb_la_LDFLAGS = -avoid-version
> +libwfb_la_LDFLAGS = -module -avoid-version
>  libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la
>  libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
>  libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
>  
> -libglx_la_LDFLAGS = -avoid-version
> +libglx_la_LDFLAGS = -module -avoid-version
>  if AIGLX_DRI_LOADER
>  GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la
>  endif
> @@ -53,11 +53,11 @@ libglx_la_LIBADD = \
>  	$(GLXDRI_LIBRARY)
>  libglx_la_SOURCES = glxmodule.c
>  
> -librecord_la_LDFLAGS = -avoid-version
> +librecord_la_LDFLAGS = -module -avoid-version
>  librecord_la_LIBADD = $(top_builddir)/record/librecord.la
>  librecord_la_SOURCES = recordmod.c
>  
> -libshadow_la_LDFLAGS = -avoid-version
> +libshadow_la_LDFLAGS = -module -avoid-version
>  libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
>  libshadow_la_SOURCES = shmodule.c
>  
> diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
> index cce19f7..87c28a4 100644
> --- a/hw/xfree86/dixmods/extmod/Makefile.am
> +++ b/hw/xfree86/dixmods/extmod/Makefile.am
> @@ -21,7 +21,7 @@ INCLUDES = @XORG_INCS@ \
>             -I$(top_srcdir)/hw/xfree86/loader \
>             -I$(top_srcdir)/miext/shadow
>  
> -libextmod_la_LDFLAGS = -avoid-version
> +libextmod_la_LDFLAGS = -module -avoid-version
>  libextmod_la_SOURCES = modinit.c \
>                         modinit.h \
>                         $(DGA_SRCS) \
> diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
> index 39f7a90..3ced531 100644
> --- a/hw/xfree86/exa/Makefile.am
> +++ b/hw/xfree86/exa/Makefile.am
> @@ -2,7 +2,7 @@ SUBDIRS = man
>  
>  module_LTLIBRARIES = libexa.la
>  
> -libexa_la_LDFLAGS = -avoid-version
> +libexa_la_LDFLAGS = -module -avoid-version
>  
>  INCLUDES = \
>  	$(XORG_INCS) \
> diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am
> index 2a03890..4472acd 100644
> --- a/hw/xfree86/fbdevhw/Makefile.am
> +++ b/hw/xfree86/fbdevhw/Makefile.am
> @@ -2,7 +2,7 @@ SUBDIRS = man
>  
>  module_LTLIBRARIES = libfbdevhw.la
>  
> -libfbdevhw_la_LDFLAGS = -avoid-version
> +libfbdevhw_la_LDFLAGS = -module -avoid-version
>  
>  if FBDEVHW
>  libfbdevhw_la_SOURCES = fbdevhw.c
> diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am
> index 3c37805..d29ded5 100644
> --- a/hw/xfree86/ramdac/Makefile.am
> +++ b/hw/xfree86/ramdac/Makefile.am
> @@ -1,5 +1,6 @@
>  noinst_LTLIBRARIES = libramdac.la
>  
> +libramdac_la_LDFLAGS = -module -avoid-version
>  libramdac_la_SOURCES = xf86RamDac.c xf86RamDacCmap.c \
>                        xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c \
>  		      xf86BitOrder.c
> diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am
> index 02d2dd4..39c6610 100644
> --- a/hw/xfree86/shadowfb/Makefile.am
> +++ b/hw/xfree86/shadowfb/Makefile.am
> @@ -1,5 +1,5 @@
>  module_LTLIBRARIES = libshadowfb.la
> -libshadowfb_la_LDFLAGS = -avoid-version
> +libshadowfb_la_LDFLAGS = -module -avoid-version
>  libshadowfb_la_SOURCES = sfbmodule.c shadow.c
>  
>  sdk_HEADERS = shadowfb.h
> diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am
> index 85c6fd8..4b794e6 100644
> --- a/hw/xfree86/vbe/Makefile.am
> +++ b/hw/xfree86/vbe/Makefile.am
> @@ -1,5 +1,5 @@
>  module_LTLIBRARIES = libvbe.la
> -libvbe_la_LDFLAGS = -avoid-version
> +libvbe_la_LDFLAGS = -module -avoid-version
>  libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
>  
>  sdk_HEADERS = vbe.h vbeModes.h
> diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
> index 5bfb4e9..7ebe0b9 100644
> --- a/hw/xfree86/xaa/Makefile.am
> +++ b/hw/xfree86/xaa/Makefile.am
> @@ -8,7 +8,7 @@ MSB_FIXED = mf-xaaBitmap.c mf-xaaStipple.c mf-xaaTEGlyph.c
>  MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c
>  POLYSEG = s-xaaLine.c s-xaaDashLine.c
>  
> -libxaa_la_LDFLAGS = -avoid-version
> +libxaa_la_LDFLAGS = -module -avoid-version
>  if COMPOSITE
>  libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la
>  endif
> -- 
> 1.7.6.1
> 
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110915/eb23cd05/attachment.pgp>

More information about the xorg-devel mailing list