!1 在rv64g架构中,存在库未链接

Merge pull request !1 from lundi001/openkylin/yangtze
This commit is contained in:
周淦清 2024-03-14 09:00:14 +00:00 committed by openkylin-cibot
parent 82440a7508
commit 1e5fb22ce1
3 changed files with 13 additions and 2 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
z3 (4.8.7-ok2) yangtze; urgency=medium
*if arch == rv64g export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed
-Wl,-latomic -Wl,--as-needed. Add schema settings to the control file.
-- root <zhouningyi@smart-core.cn> Thu, 14 Mar 2024 07:36:38 +0000
z3 (4.8.7-ok1) yangtze; urgency=medium z3 (4.8.7-ok1) yangtze; urgency=medium
* Build for openKylin. * Build for openKylin.

4
debian/control vendored
View File

@ -74,7 +74,7 @@ Description: theorem prover from Microsoft Research - Python 3 bindings
Package: libz3-java Package: libz3-java
Section: java Section: java
Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64el s390x alpha kfreebsd-amd64 kfreebsd-i386 powerpcspe riscv64 sparc64 x32 Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64el s390x alpha kfreebsd-amd64 kfreebsd-i386 powerpcspe riscv64 rv64g sparc64 x32
Multi-Arch: foreign Multi-Arch: foreign
Depends: libz3-jni (>= ${binary:Version}), libz3-jni (<< ${source:Version}.1~), libz3-dev, ${misc:Depends}, ${java:Depends} Depends: libz3-jni (>= ${binary:Version}), libz3-jni (<< ${source:Version}.1~), libz3-dev, ${misc:Depends}, ${java:Depends}
Description: theorem prover from Microsoft Research - java bindings Description: theorem prover from Microsoft Research - java bindings
@ -85,7 +85,7 @@ Description: theorem prover from Microsoft Research - java bindings
Package: libz3-jni Package: libz3-jni
Section: java Section: java
Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64el s390x alpha kfreebsd-amd64 kfreebsd-i386 powerpcspe riscv64 sparc64 x32 Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64el s390x alpha kfreebsd-amd64 kfreebsd-i386 powerpcspe riscv64 rv64g sparc64 x32
Multi-Arch: same Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: libz3-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Depends: libz3-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}

4
debian/rules vendored
View File

@ -6,6 +6,10 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CXXFLAGS_MAINT_APPEND = -fPIC export DEB_CXXFLAGS_MAINT_APPEND = -fPIC
ifeq ($(DEB_HOST_ARCH),rv64g)
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -Wl,-latomic -Wl,--as-needed
endif
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifneq (,$(shell dh_listpackages -a | grep libz3-jni)) ifneq (,$(shell dh_listpackages -a | grep libz3-jni))