From 41d17554ad0940118f427aad46f03317d21d14ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E7=82=9C?= Date: Fri, 17 Mar 2023 10:10:44 +0800 Subject: [PATCH 1/2] set build options for distribution openKylin --- debian/changelog | 6 ++++++ debian/rules.defs | 10 +++++++++- debian/rules2 | 15 +++++++++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fdf3940..b781bbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gcc-9 (9.3.0-ok7) yangtze; urgency=medium + + * debian/rules.defs,debian/rules2 add build option for distribution openKylin + + -- Xie Wei Fri, 17 Mar 2023 09:52:20 +0800 + gcc-9 (9.3.0-ok6) yangtze; urgency=medium * Rebuild: fix distribution info diff --git a/debian/rules.defs b/debian/rules.defs index 2535540..7de201a 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -14,6 +14,7 @@ distribution := $(shell lsb_release -is) distrelease := $(shell lsb_release -cs) derivative := $(shell if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; \ elif dpkg-vendor --derives-from Debian; then echo Debian; \ + elif dpkg-vendor --derives-from openKylin; then echo openKylin; \ else echo Unknown; fi) # On non official archives, "lsb_release -cs" default to "n/a". Assume @@ -528,6 +529,8 @@ else v_dbg = 9.2.1-20ubuntu2 else ifeq ($(derivative),Debian) v_dbg = 9.2.1-21 + else ifeq ($(derivative),openKylin) + v_dbg = 9.2.1-ok1 else $(error unknown version for -dbgsym package migration) endif @@ -1397,6 +1400,8 @@ else ifeq ($(distribution),Ubuntu) pie_archs += armhf arm64 i386 endif pie_archs += riscv64 +else ifeq ($(distribution),openKylin) + pie_archs = amd64 arm64 i386 riscv64 endif ifneq (,$(filter $(DEB_TARGET_ARCH),$(pie_archs))) with_pie := yes @@ -1649,7 +1654,7 @@ ifneq (,$(filter $(derivative),Ubuntu)) ifeq (,$(filter $(distrelease),dapper hardy jaunty karmic lucid)) biarch_map := $(subst i686=,i486=,$(biarch_map)) endif -else # Debian +else # Debian or openKylin biarch_map := $(subst i686=,i486=,$(biarch_map)) endif @@ -1820,6 +1825,9 @@ ifeq ($(derivative),Debian) biarchx32archs := /amd64/i386/ endif endif +ifeq ($(derivative),openKylin) + biarchx32archs := /amd64/i386/ +endif $(foreach x,32 64 n32 x32 hf sf,$(eval $(call gen_biarch,$(x)))) ifeq ($(DEB_TARGET_ARCH),sh4) diff --git a/debian/rules2 b/debian/rules2 index e8e3e7a..867178e 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -501,6 +501,8 @@ ifeq ($(derivative),Ubuntu) CONFARGS += --disable-werror else ifeq ($(derivative),Debian) CONFARGS += --disable-werror +else ifeq ($(derivative),openKylin) + CONFARGS += --disable-werror endif ifneq (,$(findstring sparc-linux,$(DEB_TARGET_GNU_TYPE))) @@ -569,12 +571,12 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 i386 kfreebsd-i386 kfreebsd-amd64)) else CONFARGS += --with-arch-32=i686 endif - else # Debian + else # Debian or openKylin ifneq (,$(filter $(distrelease),etch lenny)) CONFARGS += --with-arch-32=i486 else ifneq (,$(filter $(distrelease),squeeze wheezy jessie)) CONFARGS += --with-arch-32=i586 - else + else # include openKylin releases CONFARGS += --with-arch-32=i686 endif endif @@ -868,6 +870,15 @@ ifeq ($(derivative),Ubuntu) endif endif endif +ifeq ($(derivative),openKylin) + ifneq (,$(findstring arm, $(DEB_TARGET_GNU_CPU))) + ifeq ($(with_arm_thumb),yes) + #DEJAGNU_RUNS += -marm + else + DEJAGNU_RUNS += -mthumb + endif + endif +endif # no b-d on g++-multilib, this is run by the built compiler abi_run_check = $(strip $(if $(wildcard build/runcheck$(1).out), \ -- Gitee From 5e0ff14495b73da2736a13e1d6865762b446e597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E7=82=9C?= Date: Sun, 25 Jun 2023 15:40:40 +0800 Subject: [PATCH 2/2] build with separate autoconf2.69 --- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/rules.conf | 4 ---- debian/rules.patch | 4 ---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index b781bbe..eeddc2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gcc-9 (9.3.0-ok8) yangtze; urgency=medium + + * force build-depend to autoconf2.69 + + -- Xie Wei Fri, 17 Mar 2023 10:53:43 +0800 + gcc-9 (9.3.0-ok7) yangtze; urgency=medium * debian/rules.defs,debian/rules2 add build option for distribution openKylin diff --git a/debian/control b/debian/control index dbb3cdf..3bb1fce 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 4.5.0 Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), g++-multilib [amd64 armel armhf i386 kfreebsd-amd64 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32] , libc6.1-dev (>= 2.13-0) [alpha ia64] | libc0.3-dev (>= 2.13-0) [hurd-i386] | libc0.1-dev (>= 2.13-0) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-0), libc6-dev (>= 2.13-0) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el], lib64gcc1 [i386 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el], libc6-dev-mipsn32 [mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el], libc6-dev-mips32 [mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], libc6-dev-armhf [armel], libhfgcc1 [armel], libc6-dev-armel [armhf], libsfgcc1 [armhf], libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k], - m4, libtool, autoconf, gcc-10-base, + m4, libtool, autoconf2.69, gcc-10-base, dwz, libunwind8-dev [ia64], libatomic-ops-dev [ia64], gawk, lzma, xz-utils, patchutils, zlib1g-dev, systemtap-sdt-dev [linux-any kfreebsd-any hurd-any], @@ -1475,7 +1475,7 @@ Package: gcc-9-source Multi-Arch: foreign Architecture: all Priority: optional -Depends: make, quilt, patchutils, sharutils, gawk, lsb-release, m4, libtool, autoconf, +Depends: make, quilt, patchutils, sharutils, gawk, lsb-release, m4, libtool, autoconf2.69, ${misc:Depends} Description: Source of the GNU Compiler Collection This package contains the sources and patches which are needed to diff --git a/debian/rules.conf b/debian/rules.conf index 4abf9bc..4766bc9 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -436,10 +436,6 @@ endif AUTO_BUILD_DEP := m4, libtool, autoconf_version = 2.69 -# FIXME should have a separate 2.69 package -ifeq (,$(filter $(distrelease),lucid precise)) - autoconf_version = -endif AUTO_BUILD_DEP += autoconf$(autoconf_version), ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy dapper hardy jaunty karmic lucid maverick natty oneiric precise quantal raring saucy trusty)) diff --git a/debian/rules.patch b/debian/rules.patch index 6fcdb92..f6a6ae6 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -300,10 +300,6 @@ automake_files = $(addprefix ./, $(filter-out none, \ | sed -rn '/Makefile\.(am|in)$$/s:[^/]+/src/:src/:p' | sort -u))) autoconf_version = 2.69 -# FIXME should have a separate 2.69 package -ifeq (,$(filter $(distrelease),lucid precise)) - autoconf_version = -endif ifeq ($(trunk_build),yes) # The actual version depends on the build-dependencies set by # variable AUTO_BUILD_DEP in rules.conf. Here, we assume the -- Gitee