diff options
| -rw-r--r-- | cwiid-cflags.patch | 9 | ||||
| -rw-r--r-- | ros-humble-cwiid.spec | 18 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 24 insertions, 5 deletions
diff --git a/cwiid-cflags.patch b/cwiid-cflags.patch new file mode 100644 index 0000000..125ae47 --- /dev/null +++ b/cwiid-cflags.patch @@ -0,0 +1,9 @@ +diff --git a/defs.mak.in b/defs.mak.in +--- a/defs.mak.in ++++ b/defs.mak.in +@@ -33,4 +33,4 @@ CWIID_PLUGINS_DIR = $(ROOTDIR)@CWIID_PLUGINS_DIR@ + + DEBUGFLAGS = -g + WARNFLAGS = -Wall -W +-CFLAGS = $(DEBUGFLAGS) $(WARNFLAGS) @DEFS@ -I$(COMMON)/include ++CFLAGS = @CFLAGS@ $(DEBUGFLAGS) $(WARNFLAGS) @DEFS@ -I$(COMMON)/include diff --git a/ros-humble-cwiid.spec b/ros-humble-cwiid.spec index 053af69..b49eae6 100644 --- a/ros-humble-cwiid.spec +++ b/ros-humble-cwiid.spec @@ -6,24 +6,31 @@ Name: ros-humble-cwiid Version: 0.6.00 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CWiid Wiimote Interface — libcwiid and tools (wmgui/wminput/lswm) License: GPLv2 URL: https://github.com/abstrakraft/cwiid Source0: https://github.com/abstrakraft/cwiid/archive/fadf11e89b579bcc0336a0692ac15c93785f3f82.tar.gz#/ros-humble-cwiid-0.6.00.tar.gz +# defs.mak.in 硬编码 CFLAGS 覆盖 RPM optflags（含 -specs=generic-hardened-cc1 的 -fPIE）， +# 而 LDFLAGS 未被覆盖（RPM -specs=generic-hardened-ld 启用 PIE 链接）， +# 导致 aarch64 编译产物无 PIC 但链接 PIE → R_AARCH64_ADR_PREL_PG_HI21 重定位失败。 +# 修复：在 CFLAGS 定义中前置 @CFLAGS@（configure 保存的 RPM optflags）。 +Patch0: cwiid-cflags.patch Group: Development/Libraries Packager: openEuler Builder <builder@openeuler.org> +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: flex BuildRequires: bison -BuildRequires: gcc-c++ BuildRequires: bluetooth-devel -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: gtk2-devel +BuildRequires: glib2-devel BuildRequires: kernel-headers %description @@ -83,5 +90,8 @@ autoreconf -if %{_libdir}/pkgconfig/cwiid.pc %changelog +* Thu Oct 22 2026 openEuler Builder <builder@openeuler.org> - 0.6.00-2 +- Fix aarch64 PIE link failure: include @CFLAGS@ (RPM optflags with -fPIE) in defs.mak.in. + * Thu Oct 22 2026 openEuler Builder <builder@openeuler.org> - 0.6.00-1 - Initial package for openEuler (ROS humble dependency closure). @@ -1 +1 @@ -b69116a6d60c9ee70669ad0d5ba6b1cf ros-humble-cwiid-0.6.00.tar.gz +59119f86e6ea24213ce21ba895e84a1e ros-humble-cwiid-0.6.00.tar.gz |