Skip to content

Commit 87dbafe

Browse files
mmcif: Add version 1.2.0 (#2572)
* mmcif: Add version 1.2.0 Signed-off-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> * mmcif: carry forward riscv64 patches to 1.2.0 Nightly version bump omitted the patches/mmcif/<version> directory for 1.2.0, so the build's unconditional `git apply .../*.patch` step failed with "No such file or directory" before any build/test ran. Copied forward the same patch set from 1.1.1 (unchanged since then). --------- Signed-off-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> Co-authored-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> Co-authored-by: Ludovic Henry <git@ludovic.dev>
1 parent 99016a7 commit 87dbafe

2 files changed

Lines changed: 40 additions & 0 deletions

File tree

‎docs/packages/mmcif.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ versions:
1818
- filename: mmcif-1.1.1-cp314-cp314t-manylinux_2_39_riscv64.whl
1919
sha256: 694743bd4e50b39742aae0958728c802528b8af651d870db86fe1492646d55c4
2020
requires-python: '>=3.8'
21+
- version: 1.2.0
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From c4810cb4b5b938fd8c2f0bff467f1fbbd4d012ec Mon Sep 17 00:00:00 2001
2+
From: Ludovic Henry <git@ludovic.dev>
3+
Date: Thu, 10 Sep 2026 08:07:11 +0200
4+
Subject: [PATCH] build: compile the C++ core with -fPIC
5+
6+
Upstream-Status: To upstream [not submitted; this port's automation may not open issues or PRs on repos other than riseproject-dev/python-wheels]
7+
8+
CMAKE_C_FLAGS carries -fPIC but CMAKE_CXX_FLAGS does not, so the C++
9+
object files that make up mmciflib-all (linked into the pybind11
10+
shared module mmciflib.*.so) are compiled position-dependent. This
11+
goes unnoticed on x86_64/aarch64, but riscv64's binutils ld enforces
12+
PIC strictly for shared-object relocations and segfaults while
13+
generating the -flto link (an assertion failure in elfnn-riscv.c),
14+
after first reporting the underlying cause:
15+
16+
relocation R_RISCV_HI20 against `a local symbol' can not be used
17+
when making a shared object; recompile with -fPIC
18+
19+
Add -fPIC to CMAKE_CXX_FLAGS to match CMAKE_C_FLAGS.
20+
---
21+
CMakeLists.txt | 2 +-
22+
1 file changed, 1 insertion(+), 1 deletion(-)
23+
24+
diff --git a/CMakeLists.txt b/CMakeLists.txt
25+
index 35eeaca..6571ac5 100644
26+
--- a/CMakeLists.txt
27+
+++ b/CMakeLists.txt
28+
@@ -60,7 +60,7 @@ if (NOT CONFIGURED_ONCE)
29+
#set(CMAKE_CXX_FLAGS "${warnings} ${mydefines} -fno-common -fvisibility=hidden -fvisibility-inlines-hidden -std=c++14 -flto "
30+
# CACHE STRING "Flags used by the compiler during all build types." FORCE)
31+
#
32+
- set(CMAKE_CXX_FLAGS "${warnings} ${mydefines} -fno-common -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -flto "
33+
+ set(CMAKE_CXX_FLAGS "${warnings} ${mydefines} -fno-common -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -flto -fPIC "
34+
CACHE STRING "Flags used by the compiler during all build types." FORCE)
35+
#
36+
set(CMAKE_C_FLAGS "${warnings} ${mydefines} -fPIC"
37+
--
38+
2.50.1 (Apple Git-155)
39+

0 commit comments

Comments
 (0)