diff options
| author | Emil Velikov <[email protected]> | 2014-03-13 02:32:29 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-03-31 12:59:16 +0100 |
| commit | 5503c227d98c6030455cc94197d462a066294f37 (patch) | |
| tree | d673eda2a1a6a55916eb0d70d0a9550a838e272d | |
| parent | 6c8d8119caf99fffcfb2f50763267ae0a9ed8738 (diff) | |
automake: consistently use -no-undefined
Set the flag for all but the dri targets. They have missing
glapi symbols which are required for the normal operation with
the X server.
Jon, I fear that you'll need to carry the "no-undefined" hunk
locally when building the dri drivers under cygwin.
Cc: Jon TURNEY <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/egl/wayland/wayland-egl/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gallium/Automake.inc | 17 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gbm/Makefile.am | 4 |
4 files changed, 15 insertions, 11 deletions
diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am index c8d01967f08..b8d1634fe56 100644 --- a/src/egl/wayland/wayland-egl/Makefile.am +++ b/src/egl/wayland/wayland-egl/Makefile.am @@ -8,7 +8,9 @@ AM_CFLAGS = $(DEFINES) \ lib_LTLIBRARIES = libwayland-egl.la noinst_HEADERS = wayland-egl-priv.h libwayland_egl_la_SOURCES = wayland-egl.c -libwayland_egl_la_LDFLAGS = -version-info 1 +libwayland_egl_la_LDFLAGS = \ + -no-undefined \ + -version-info 1 TESTS = wayland-egl-symbols-check diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index a8981fb11d5..f36d93da403 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -54,25 +54,24 @@ GALLIUM_VIDEO_CFLAGS = \ DRI_VERSION_SCRIPT ?= $(top_srcdir)/src/gallium/state_trackers/dri/dri.link GALLIUM_DRI_LINKER_FLAGS = \ + -shared \ -module \ -avoid-version \ - -Wl,--version-script=$(DRI_VERSION_SCRIPT) \ - -shared \ - -no-undefined + -Wl,--version-script=$(DRI_VERSION_SCRIPT) GALLIUM_VDPAU_LINKER_FLAGS = \ + -shared \ -module \ + -no-undefined \ -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ - -export-symbols-regex $(VDPAU_EXPORTS) \ - -shared \ - -no-undefined + -export-symbols-regex $(VDPAU_EXPORTS) GALLIUM_XVMC_LINKER_FLAGS = \ + -shared \ -module \ + -no-undefined \ -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \ - -shared \ - -export-symbols-regex '^XvMC' \ - -no-undefined + -export-symbols-regex '^XvMC' GALLIUM_OMX_LINKER_FLAGS = \ -shared \ diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index b492496a743..55eb3baaa06 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -46,6 +46,7 @@ AM_CPPFLAGS = \ AM_LDFLAGS = \ -module \ + -no-undefined \ -avoid-version \ -Wl,--no-undefined \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.link diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am index 6abd2a746d6..d19716309be 100644 --- a/src/gbm/Makefile.am +++ b/src/gbm/Makefile.am @@ -19,7 +19,9 @@ include_HEADERS = main/gbm.h libgbm_la_SOURCES = \ main/gbm.c \ main/backend.c -libgbm_la_LDFLAGS = -version-info 1:0 +libgbm_la_LDFLAGS = \ + -no-undefined \ + -version-info 1:0 libgbm_la_LIBADD = \ $(top_builddir)/src/loader/libloader.la \ $(DLOPEN_LIBS) |