Skip to content
This repository was archived by the owner on Nov 4, 2021. It is now read-only.

Commit becd6aa

Browse files
authored
Merge pull request #65 from umarcor/ghdl/version
ghdl: ensure that version contains a valid string
2 parents d4bb83d + 629b9f6 commit becd6aa

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

scripts/compile_ghdl.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ cd $BUILD_DIR/$dir_name
1212

1313
# remove unwanted -lz linker flag on Darwin (because it causes a dynamic link)
1414
patch -p1 < $WORK_DIR/scripts/libghdl_static.diff
15+
patch -p1 < $WORK_DIR/scripts/ghdl_version.diff
16+
17+
export GHDL_DESC="$(git -C $UPSTREAM_DIR/$dir_name describe --dirty 2> /dev/null)"
18+
sed -i -e "s/@BUILDER@/open-tool-forge.$VERSION/" src/version.in
1519

1620
# -- Compile it
1721
if [ $ARCH == "darwin" ]; then

scripts/ghdl_version.diff

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/src/version.in
2+
+++ b/src/version.in
3+
@@ -1,5 +1,6 @@
4+
package Version is
5+
Ghdl_Ver : constant String := "@VER@";
6+
Ghdl_Release : constant String :=
7+
- "(tarball) [Dunoon edition]";
8+
+ "(tarball) [Dunoon edition]" &
9+
+ " @BUILDER@";
10+
end Version;

0 commit comments

Comments
 (0)