products/SUSE_ALP_Standard
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'build-disable python-redis, disable 32bit build on ALP, cleanup Workbench section' (#25) from fcrozat/SUSE_ALP_Standard:1.0 into 1.0

Browse Source 
Reviewed-on: https://src.suse.de/products/SUSE_ALP_Standard/pulls/25
This commit is contained in:
Marco Strigl 2023-10-23 10:49:02 +02:00
commit 96626e1a1e
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
_config
View File

@ -105,6 +105,8 @@ BuildFlags: excludebuild:python-isort:test
BuildFlags: excludebuild:virt-manager:test
BuildFlags: excludebuild:python-pandas:test-py311
# temporary disable to allow staging to work properly, will remove once fixed sr are done
BuildFlags: excludebuild:python-redis
# no 32bit on ALP
BuildFlags: excludebuild:rpmlint:test
@ -1834,12 +1836,34 @@ Optflags: * -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-st
%define skelcd_compat 0
%define _without_aom 1
%define _without_avif 1
%define disable_32bit 1
%ifarch s390x
%define tuneflag zEC12
%define archflag zEC12
Macros:
%tuneflag zEC12
%archflag zEC12
:Macros
%endif
Substitute: glibc-devel-32bit
Substitute: glibc-devel-static-32bit
Substitute: gcc-32bit
Substitute: gcc5-32bit
Substitute: gcc6-32bit
Substitute: gcc-ada-32bit
Substitute: gcc5-c++-32bit
Substitute: gcc6-c++-32bit
Substitute: gcc-c++-32bit
Macros:
%suse_version 1600
%workbench_version 0100
%is_opensuse 0
%skelcd_compat 0
%disable_32bit 1
%_without_aom 1
%_without_avif 1
%build_ldflags %{?_lto_cflags}
@ -1923,34 +1947,8 @@ Macros:
# Support: !rpmlint-Factory
# Support: !rpmlint-Factory-strict
# copy-paste from openSUSE:Factory:zSystems
%ifarch s390x
%define disable_32bit 1
%define tuneflag zEC12
%define archflag zEC12
Macros:
%disable_32bit 1
%tuneflag zEC12
%archflag zEC12
:Macros
Substitute: glibc-devel-32bit
Substitute: glibc-devel-static-32bit
Substitute: gcc-32bit
Substitute: gcc5-32bit
Substitute: gcc6-32bit
Substitute: gcc-ada-32bit
Substitute: gcc5-c++-32bit
Substitute: gcc6-c++-32bit
Substitute: gcc-c++-32bit
%endif
Substitute: mail
%if 1
%if "%_project" == "SUSE:ALP:Workbench:1.0"
%if "%_repository" == "standard"
%ifarch riscv64
@ -1976,6 +1974,5 @@ ExportFilter: ^(kernel-obs-build|qemu-linux-user).*\.riscv64\.rpm$
ExportFilter: ^qemu-linux-user-riscv.*\.riscv64\.rpm$ .
%endif # %qemu_user_space_build
%endif # SUSE:ALP
%endif # 1
%endif # SUSE:ALP:Workbench:1.0