Skip to content

Commit 3cea01c

Browse files
committed
rebuild to remove unwanted header in include-fixed
1 parent 7762c3d commit 3cea01c

File tree

1 file changed

+30
-11
lines changed

1 file changed

+30
-11
lines changed

specs/release_package.anod

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ valid_packages = ["gprbuild", "gnat", "gnatcov", "gnatprove"]
1010

1111

1212
class ReleasePackage(spec("common")):
13-
1413
@property
1514
def package(self):
1615
if "package" not in self.parsed_qualifier:
@@ -48,12 +47,7 @@ class ReleasePackage(spec("common")):
4847
"gprbuild": "1",
4948
"gnatcov": "1",
5049
"gnatprove": "1",
51-
"gnat": {
52-
"arm-eabi": "1",
53-
"riscv64-elf": "1",
54-
"avr": "1",
55-
"_": "1",
56-
}
50+
"gnat": "2",
5751
}
5852

5953
if isinstance(r := release[package], dict):
@@ -94,8 +88,10 @@ class ReleasePackage(spec("common")):
9488
def build_deps(self):
9589
pck = self.package
9690
if pck == "gprbuild":
97-
return [Anod.Dependency("gprbuild"),
98-
Anod.Dependency("gpr2", qualifier="tools_only")]
91+
return [
92+
Anod.Dependency("gprbuild"),
93+
Anod.Dependency("gpr2", qualifier="tools_only"),
94+
]
9995

10096
if pck == "gnatcov":
10197
return [Anod.Dependency("gnatcov", track=True)]
@@ -140,17 +136,40 @@ class ReleasePackage(spec("common")):
140136
Anod.Dependency("gdb", track=True),
141137
]
142138
else:
143-
raise Exception("Unknown target for gcc package: '%s'" % self.env.target.triplet)
139+
raise Exception(
140+
"Unknown target for gcc package: '%s'" % self.env.target.triplet
141+
)
144142

145143
@Anod.primitive()
146144
def build(self):
147-
148145
for dep in self.deps.keys():
149146
self.deps[dep].merge(self["PKG_DIR"])
150147

151148
name = self.release_name
152149
archive = self.archive_name
153150

151+
# fix for unwanted pthread.h header in include-fixed
152+
extra_header = None
153+
if self.package == "gnat":
154+
extra_header = os.path.join(
155+
self["PKG_DIR"],
156+
"lib/gcc",
157+
self.env.target.triplet,
158+
self.version,
159+
"include-fixed/pthread.h"
160+
)
161+
elif self.package == "gnatprove":
162+
extra_header = os.path.join(
163+
self["PKG_DIR"],
164+
"libexec/spark/lib/gcc",
165+
self.env.target.triplet,
166+
self.version,
167+
"include-fixed/pthread.h"
168+
)
169+
170+
if extra_header is not None and os.path.exists(extra_header):
171+
os.remove(extra_header)
172+
154173
create_archive(
155174
filename=archive,
156175
from_dir=self["PKG_DIR"],

0 commit comments

Comments
 (0)