OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automake: don't enable -Wl,--no-undefined on OpenBSD

Browse Source 
OpenBSD does not have DT_NEEDED entries for libc by design,
over concerns how the symbols would be referenced after
changing the major version of the library.

So avoid -no-undefined checks on OpenBSD as they will fail.

v2: don't include the -no-undefined libtool option in the variable
    and change -Wl,--no-undefined references in Automake.inc as well.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76856
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Jonathan Gray
2014-04-03 15:46:01 +11:00
committed by Emil Velikov
parent e4bd00c1c6
commit 11623be934
18 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/egl/main/Makefile.am
View File

@@ -78,7 +78,7 @@ libEGL_la_LDFLAGS = \
-version-number 1:0 \ -version-number 1:0 \
-Wl,-Bsymbolic \ -Wl,-Bsymbolic \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
if HAVE_EGL_PLATFORM_X11 if HAVE_EGL_PLATFORM_X11
AM_CFLAGS += -DHAVE_X11_PLATFORM AM_CFLAGS += -DHAVE_X11_PLATFORM

2
src/egl/wayland/wayland-egl/Makefile.am
View File

@@ -12,7 +12,7 @@ libwayland_egl_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-info 1 \ -version-info 1 \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
TESTS = wayland-egl-symbols-check TESTS = wayland-egl-symbols-check

6
src/gallium/Automake.inc
View File

@@ -67,7 +67,7 @@ GALLIUM_VDPAU_LINKER_FLAGS = \
-version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
-export-symbols-regex $(VDPAU_EXPORTS) \ -export-symbols-regex $(VDPAU_EXPORTS) \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
GALLIUM_XVMC_LINKER_FLAGS = \ GALLIUM_XVMC_LINKER_FLAGS = \
-shared \ -shared \
@@ -76,7 +76,7 @@ GALLIUM_XVMC_LINKER_FLAGS = \
-version-number $(XVMC_MAJOR):$(XVMC_MINOR) \ -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
-export-symbols-regex '^XvMC' \ -export-symbols-regex '^XvMC' \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
GALLIUM_OMX_LINKER_FLAGS = \ GALLIUM_OMX_LINKER_FLAGS = \
-shared \ -shared \
@@ -84,7 +84,7 @@ GALLIUM_OMX_LINKER_FLAGS = \
-no-undefined \ -no-undefined \
-export-symbols-regex $(EXPORTS) \ -export-symbols-regex $(EXPORTS) \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
GALLIUM_COMMON_LIB_DEPS = \ GALLIUM_COMMON_LIB_DEPS = \
-lm \ -lm \

2
src/gallium/targets/egl-static/Makefile.am
View File

@@ -49,7 +49,7 @@ AM_LDFLAGS = \
-no-undefined \ -no-undefined \
-avoid-version \ -avoid-version \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined \ $(LD_NO_UNDEFINED) \
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.link -Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.link
egldir = $(EGL_DRIVER_INSTALL_DIR) egldir = $(EGL_DRIVER_INSTALL_DIR)

2
src/gallium/targets/gbm/Makefile.am
View File

@@ -68,7 +68,7 @@ gbm_gallium_drm_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-avoid-version \ -avoid-version \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
if HAVE_MESA_LLVM if HAVE_MESA_LLVM
gbm_gallium_drm_la_LIBADD += $(LLVM_LIBS) gbm_gallium_drm_la_LIBADD += $(LLVM_LIBS)

2
src/gallium/targets/libgl-xlib/Makefile.am
View File

@@ -48,7 +48,7 @@ libGL_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \ -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
libGL_la_LIBADD = \ libGL_la_LIBADD = \
$(top_builddir)/src/gallium/state_trackers/glx/xlib/libxlib.la \ $(top_builddir)/src/gallium/state_trackers/glx/xlib/libxlib.la \

2
src/gallium/targets/opencl/Makefile.am
View File

@@ -7,7 +7,7 @@ lib@OPENCL_LIBNAME@_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-number 1:0 \ -version-number 1:0 \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
lib@OPENCL_LIBNAME@_la_LIBADD = \ lib@OPENCL_LIBNAME@_la_LIBADD = \

2
src/gallium/targets/osmesa/Makefile.am
View File

@@ -44,7 +44,7 @@ lib@OSMESA_LIB@_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-number @OSMESA_VERSION@ \ -version-number @OSMESA_VERSION@ \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
if HAVE_SHARED_GLAPI if HAVE_SHARED_GLAPI

2
src/gallium/targets/pipe-loader/Makefile.am
View File

@@ -47,7 +47,7 @@ AM_LDFLAGS = \
-no-undefined \ -no-undefined \
-avoid-version \ -avoid-version \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined \ $(LD_NO_UNDEFINED) \
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.link -Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.link
if HAVE_MESA_LLVM if HAVE_MESA_LLVM

2
src/gallium/targets/xa/Makefile.am
View File

@@ -64,7 +64,7 @@ libxatracker_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-number $(XA_MAJOR):$(XA_MINOR):$(XA_TINY) \ -version-number $(XA_MAJOR):$(XA_MINOR):$(XA_TINY) \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
if HAVE_MESA_LLVM if HAVE_MESA_LLVM
libxatracker_la_LIBADD += $(LLVM_LIBS) libxatracker_la_LIBADD += $(LLVM_LIBS)

2
src/gbm/Makefile.am
View File

@@ -23,7 +23,7 @@ libgbm_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-info 1:0 \ -version-info 1:0 \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
libgbm_la_LIBADD = \ libgbm_la_LIBADD = \
$(top_builddir)/src/loader/libloader.la \ $(top_builddir)/src/loader/libloader.la \

2
src/glx/Makefile.am
View File

@@ -113,7 +113,7 @@ GL_LDFLAGS = \
-version-number 1:2 \ -version-number 1:2 \
-Wl,-Bsymbolic \ -Wl,-Bsymbolic \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
lib@GL_LIB@_la_SOURCES = lib@GL_LIB@_la_SOURCES =
lib@GL_LIB@_la_LIBADD = $(GL_LIBS) lib@GL_LIB@_la_LIBADD = $(GL_LIBS)

2
src/mapi/es1api/Makefile.am
View File

@@ -48,7 +48,7 @@ libGLESv1_CM_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-number 1:1 \ -version-number 1:1 \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
if HAVE_SHARED_GLAPI if HAVE_SHARED_GLAPI
libGLESv1_CM_la_LIBADD += ../shared-glapi/libglapi.la libGLESv1_CM_la_LIBADD += ../shared-glapi/libglapi.la

2
src/mapi/es2api/Makefile.am
View File

@@ -53,7 +53,7 @@ libGLESv2_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-number 2 \ -version-number 2 \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
if HAVE_SHARED_GLAPI if HAVE_SHARED_GLAPI
libGLESv2_la_LIBADD += ../shared-glapi/libglapi.la libGLESv2_la_LIBADD += ../shared-glapi/libglapi.la

2
src/mapi/shared-glapi/Makefile.am
View File

@@ -12,7 +12,7 @@ libglapi_la_LIBADD = $(PTHREAD_LIBS) $(SELINUX_LIBS)
libglapi_la_LDFLAGS = \ libglapi_la_LDFLAGS = \
-no-undefined \ -no-undefined \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
include $(GLAPI)/gen/glapi_gen.mk include $(GLAPI)/gen/glapi_gen.mk
glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)

2
src/mapi/vgapi/Makefile.am
View File

@@ -48,7 +48,7 @@ libOpenVG_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-number 1 \ -version-number 1 \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi_abi.py vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi_abi.py
$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi_abi.py \ $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi_abi.py \

2
src/mesa/drivers/osmesa/Makefile.am
View File

@@ -40,7 +40,7 @@ lib@OSMESA_LIB@_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-number @OSMESA_VERSION@ \ -version-number @OSMESA_VERSION@ \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
if HAVE_SHARED_GLAPI if HAVE_SHARED_GLAPI

2
src/mesa/drivers/x11/Makefile.am
View File

@@ -65,6 +65,6 @@ lib@GL_LIB@_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \ -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
$(GC_SECTIONS) \ $(GC_SECTIONS) \
-Wl,--no-undefined $(LD_NO_UNDEFINED)
include $(top_srcdir)/install-lib-links.mk include $(top_srcdir)/install-lib-links.mk