FYI, I have just realized VISIBILITY_CFLAGS cannot be applied to libdricore, because it needs to export everything. (it's a shared core Mesa library)
Marek On Mon, Oct 7, 2013 at 4:27 PM, Emil Velikov <[email protected]> wrote: > On 07/10/13 14:21, Tom Stellard wrote: >> On Mon, Oct 07, 2013 at 01:52:35PM +0200, Marek Olšák wrote: >>> From: Marek Olšák <[email protected]> >>> >>> I wonder why we don't just append the flags in configure.ac. They have to be >>> used everywhere anyway. >> >> I'm not sure why either, but you could add this variable to >> src/gallium/Automake.inc if you want to. >> > That was(still is) on my todo list right after the dust(reports) from > the makefile.sources commits has settled in :) AFAICS radeon is the only > slightly questionable user of VISIBILITY_CFLAGS, with all the LLVM > linking and alike. But if you have tested it then I can proceed and rip > other common bits to configure.ac or src/gallium/Automake.inc > > Thanks Marek > >> Either way, the series is >> Reviewed-by: Tom Stellard <[email protected]> >> >>> --- >>> src/gallium/drivers/r600/Makefile.am | 3 ++- >>> src/gallium/drivers/radeon/Makefile.am | 8 +++++--- >>> src/gallium/drivers/radeonsi/Makefile.am | 4 +++- >>> src/gallium/targets/r300/dri/Makefile.am | 3 ++- >>> src/gallium/targets/r300/vdpau/Makefile.am | 3 ++- >>> src/gallium/targets/r300/xvmc/Makefile.am | 3 ++- >>> src/gallium/targets/r600/dri/Makefile.am | 3 ++- >>> src/gallium/targets/r600/vdpau/Makefile.am | 3 ++- >>> src/gallium/targets/r600/xorg/Makefile.am | 3 ++- >>> src/gallium/targets/r600/xvmc/Makefile.am | 3 ++- >>> src/gallium/targets/radeonsi/dri/Makefile.am | 3 ++- >>> src/gallium/targets/radeonsi/vdpau/Makefile.am | 3 ++- >>> src/gallium/targets/radeonsi/xorg/Makefile.am | 3 ++- >>> src/gallium/winsys/radeon/drm/Makefile.am | 3 ++- >>> 14 files changed, 32 insertions(+), 16 deletions(-) >>> >>> diff --git a/src/gallium/drivers/r600/Makefile.am >>> b/src/gallium/drivers/r600/Makefile.am >>> index cbe4a09..0490ba2 100644 >>> --- a/src/gallium/drivers/r600/Makefile.am >>> +++ b/src/gallium/drivers/r600/Makefile.am >>> @@ -16,7 +16,8 @@ AM_CXXFLAGS = \ >>> -I$(top_srcdir)/src/gallium/include \ >>> -I$(top_srcdir)/src/gallium/auxiliary \ >>> $(RADEON_CFLAGS) \ >>> - $(DEFINES) >>> + $(DEFINES) \ >>> + $(VISIBILITY_CFLAGS) >>> >>> libr600_la_SOURCES = \ >>> $(C_SOURCES) \ >>> diff --git a/src/gallium/drivers/radeon/Makefile.am >>> b/src/gallium/drivers/radeon/Makefile.am >>> index d5a6ff2..a54a3aa 100644 >>> --- a/src/gallium/drivers/radeon/Makefile.am >>> +++ b/src/gallium/drivers/radeon/Makefile.am >>> @@ -3,7 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> >>> noinst_LTLIBRARIES = libradeon.la >>> >>> -AM_CFLAGS = $(GALLIUM_CFLAGS) $(RADEON_CFLAGS) >>> +AM_CFLAGS = $(GALLIUM_CFLAGS) $(RADEON_CFLAGS) $(VISIBILITY_CFLAGS) >>> >>> libradeon_la_SOURCES = \ >>> $(C_SOURCES) >>> @@ -17,11 +17,13 @@ noinst_LTLIBRARIES += libllvmradeon.la >>> >>> libllvmradeon_la_CXXFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> - $(DEFINES) >>> + $(DEFINES) \ >>> + $(VISIBILITY_CFLAGS) >>> >>> libllvmradeon_la_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> - $(LLVM_CFLAGS) >>> + $(LLVM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> >>> libllvmradeon_la_SOURCES = \ >>> $(LLVM_CPP_FILES) \ >>> diff --git a/src/gallium/drivers/radeonsi/Makefile.am >>> b/src/gallium/drivers/radeonsi/Makefile.am >>> index 0c27973..9aaab8f 100644 >>> --- a/src/gallium/drivers/radeonsi/Makefile.am >>> +++ b/src/gallium/drivers/radeonsi/Makefile.am >>> @@ -31,7 +31,9 @@ AM_CPPFLAGS = \ >>> -I$(top_srcdir)/include \ >>> $(GALLIUM_CFLAGS) \ >>> $(RADEON_CFLAGS) >>> -AM_CFLAGS = $(LLVM_CFLAGS) >>> +AM_CFLAGS = \ >>> + $(LLVM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> >>> libradeonsi_la_SOURCES = $(C_SOURCES) >>> libradeonsi_la_LIBADD = \ >>> diff --git a/src/gallium/targets/r300/dri/Makefile.am >>> b/src/gallium/targets/r300/dri/Makefile.am >>> index 5e9b5c3..4b41c30 100644 >>> --- a/src/gallium/targets/r300/dri/Makefile.am >>> +++ b/src/gallium/targets/r300/dri/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(LIBDRM_CFLAGS) >>> + $(LIBDRM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys \ >>> diff --git a/src/gallium/targets/r300/vdpau/Makefile.am >>> b/src/gallium/targets/r300/vdpau/Makefile.am >>> index c928955..3df5691 100644 >>> --- a/src/gallium/targets/r300/vdpau/Makefile.am >>> +++ b/src/gallium/targets/r300/vdpau/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(LIBDRM_CFLAGS) >>> + $(LIBDRM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys >>> diff --git a/src/gallium/targets/r300/xvmc/Makefile.am >>> b/src/gallium/targets/r300/xvmc/Makefile.am >>> index 7171b4d..079a0eb 100644 >>> --- a/src/gallium/targets/r300/xvmc/Makefile.am >>> +++ b/src/gallium/targets/r300/xvmc/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(LIBDRM_CFLAGS) >>> + $(LIBDRM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys >>> diff --git a/src/gallium/targets/r600/dri/Makefile.am >>> b/src/gallium/targets/r600/dri/Makefile.am >>> index 8f4d7f7..c7fca32 100644 >>> --- a/src/gallium/targets/r600/dri/Makefile.am >>> +++ b/src/gallium/targets/r600/dri/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(LIBDRM_CFLAGS) >>> + $(LIBDRM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys \ >>> diff --git a/src/gallium/targets/r600/vdpau/Makefile.am >>> b/src/gallium/targets/r600/vdpau/Makefile.am >>> index e45fd93..07b0eaa 100644 >>> --- a/src/gallium/targets/r600/vdpau/Makefile.am >>> +++ b/src/gallium/targets/r600/vdpau/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(LIBDRM_CFLAGS) >>> + $(LIBDRM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys >>> diff --git a/src/gallium/targets/r600/xorg/Makefile.am >>> b/src/gallium/targets/r600/xorg/Makefile.am >>> index 90bcbd5..c3dee5a 100644 >>> --- a/src/gallium/targets/r600/xorg/Makefile.am >>> +++ b/src/gallium/targets/r600/xorg/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(XORG_CFLAGS) >>> + $(XORG_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys \ >>> diff --git a/src/gallium/targets/r600/xvmc/Makefile.am >>> b/src/gallium/targets/r600/xvmc/Makefile.am >>> index 8443e17..2083b87 100644 >>> --- a/src/gallium/targets/r600/xvmc/Makefile.am >>> +++ b/src/gallium/targets/r600/xvmc/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(LIBDRM_CFLAGS) >>> + $(LIBDRM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys >>> diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am >>> b/src/gallium/targets/radeonsi/dri/Makefile.am >>> index 23313c3..8a78f1b 100644 >>> --- a/src/gallium/targets/radeonsi/dri/Makefile.am >>> +++ b/src/gallium/targets/radeonsi/dri/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(LIBDRM_CFLAGS) >>> + $(LIBDRM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys \ >>> diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am >>> b/src/gallium/targets/radeonsi/vdpau/Makefile.am >>> index bda88e6..4a43169 100644 >>> --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am >>> +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(LIBDRM_CFLAGS) >>> + $(LIBDRM_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys >>> diff --git a/src/gallium/targets/radeonsi/xorg/Makefile.am >>> b/src/gallium/targets/radeonsi/xorg/Makefile.am >>> index 2eddf02..5f098d5 100644 >>> --- a/src/gallium/targets/radeonsi/xorg/Makefile.am >>> +++ b/src/gallium/targets/radeonsi/xorg/Makefile.am >>> @@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> $(GALLIUM_CFLAGS) \ >>> $(PTHREAD_CFLAGS) \ >>> - $(XORG_CFLAGS) >>> + $(XORG_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> AM_CPPFLAGS = \ >>> -I$(top_srcdir)/src/gallium/drivers \ >>> -I$(top_srcdir)/src/gallium/winsys \ >>> diff --git a/src/gallium/winsys/radeon/drm/Makefile.am >>> b/src/gallium/winsys/radeon/drm/Makefile.am >>> index 184d257..d5c5474 100644 >>> --- a/src/gallium/winsys/radeon/drm/Makefile.am >>> +++ b/src/gallium/winsys/radeon/drm/Makefile.am >>> @@ -4,7 +4,8 @@ include $(top_srcdir)/src/gallium/Automake.inc >>> AM_CFLAGS = \ >>> -I$(top_srcdir)/include \ >>> $(GALLIUM_CFLAGS) \ >>> - $(RADEON_CFLAGS) >>> + $(RADEON_CFLAGS) \ >>> + $(VISIBILITY_CFLAGS) >>> >>> noinst_LTLIBRARIES = libradeonwinsys.la >>> >>> -- >>> 1.8.1.2 >>> >>> _______________________________________________ >>> mesa-dev mailing list >>> [email protected] >>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev >> _______________________________________________ >> mesa-dev mailing list >> [email protected] >> http://lists.freedesktop.org/mailman/listinfo/mesa-dev >> > _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
