[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/mesa][debian-experimental] 3 commits: rules: Use -O1 for sh3 & sh4, thanks John Paul Adrian Glaubitz! (Closes:# 887444)



Title: GitLab

Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / mesa

Commits:

2 changed files:

Changes:

  • debian/changelog
    1
    -mesa (18.0.0~rc2-1) UNRELEASED; urgency=medium
    
    1
    +mesa (18.0.0~rc2-1) unstable; urgency=medium
    
    2 2
     
    
    3 3
       * New upstream release.
    
    4 4
       * libgbm1.symbols: Updated.
    
    5
    +  * rules: Use -O1 for sh3 & sh4, thanks John Paul Adrian Glaubitz!
    
    6
    +    (Closes:# 887444)
    
    7
    +  * rules: Fix hurd FTBFS, thanks Samuel Thibault! (Closes: #888047)
    
    5 8
     
    
    6
    - -- Timo Aaltonen <tjaalton@debian.org>  Thu, 25 Jan 2018 11:55:37 +0200
    
    9
    + -- Timo Aaltonen <tjaalton@debian.org>  Thu, 25 Jan 2018 13:42:14 +0200
    
    7 10
     
    
    8 11
     mesa (17.3.3-1) unstable; urgency=medium
    
    9 12
     
    

  • debian/rules
    ... ... @@ -10,13 +10,19 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
    10 10
     DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
    
    11 11
     DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
    
    12 12
     
    
    13
    -ifeq (,$(filter $(DEB_HOST_ARCH), armhf))
    
    13
    +ifeq (,$(filter $(DEB_HOST_ARCH), armhf sh3 sh4))
    
    14 14
     buildflags = \
    
    15 15
     	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
    
    16 16
     else
    
    17
    -# Workaround for a variant of LP: #725126
    
    18
    -buildflags = \
    
    17
    +  ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
    
    18
    +  # Workaround for a variant of LP: #725126
    
    19
    +  buildflags = \
    
    19 20
     	$(shell DEB_CFLAGS_MAINT_APPEND="-Wall -fno-optimize-sibling-calls" DEB_CXXFLAGS_MAINT_APPEND="-Wall -fno-optimize-sibling-calls" dpkg-buildflags --export=configure)
    
    21
    +  else
    
    22
    +  # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143
    
    23
    +  buildflags = \
    
    24
    +	$(shell DEB_CFLAGS_MAINT_APPEND="-Wall -O1" DEB_CXXFLAGS_MAINT_APPEND="-Wall -O1" dpkg-buildflags --export=configure)
    
    25
    +  endif
    
    20 26
     endif
    
    21 27
     
    
    22 28
     # keep a list of files we don't install (yet), but since it's a bit
    
    ... ... @@ -26,16 +32,20 @@ include debian/not-installed
    26 32
     DRI_DRIVERS =
    
    27 33
     GALLIUM_DRIVERS =
    
    28 34
     VULKAN_DRIVERS =
    
    29
    -EGL_PLATFORMS = x11,surfaceless
    
    30 35
     
    
    31 36
     confflags_DRI3 = --disable-dri3
    
    32 37
     
    
    33 38
     # hurd doesn't do direct rendering
    
    34 39
     ifeq ($(DEB_HOST_ARCH_OS), hurd)
    
    40
    +	EGL_PLATFORMS = x11
    
    41
    +
    
    35 42
     	confflags_DIRECT_RENDERING = --disable-driglx-direct
    
    36 43
     	confflags_GBM = --disable-gbm
    
    37 44
     	DRI_DRIVERS = swrast
    
    45
    +	with_libva = 
    
    38 46
     else
    
    47
    +	EGL_PLATFORMS = x11,surfaceless
    
    48
    +
    
    39 49
       ifeq ($(DEB_HOST_ARCH_OS), linux)
    
    40 50
     	confflags_DRI3 = --enable-dri3
    
    41 51
     	# Gallium drivers which require kernel support, not yet ported to non-Linux
    
    ... ... @@ -108,6 +118,7 @@ else
    108 118
     	confflags_GALLIUM += --enable-va
    
    109 119
     	confflags_GALLIUM += --enable-gallium-extra-hud
    
    110 120
     	confflags_GALLIUM += --enable-lmsensors
    
    121
    +	with_libva = ,libva
    
    111 122
     endif
    
    112 123
     
    
    113 124
     # Disable assembly usage on x32 otherwise Mesa defaults to x86_64 assembly
    
    ... ... @@ -227,7 +238,7 @@ override_dh_makeshlibs:
    227 238
     	dh_makeshlibs -a -- -c4
    
    228 239
     
    
    229 240
     %:
    
    230
    -	dh $@ --with quilt,libva \
    
    241
    +	dh $@ --with quilt$(with_libva) \
    
    231 242
     		--builddirectory=build/
    
    232 243
     
    
    233 244
     # For maintainer use only, generate a tarball:
    


  • Reply to: