diff options
Diffstat (limited to 'meta/recipes-support/sass/sassc/0001-Remove-sassc_version.h-from-source-directory.patch')
-rw-r--r-- | meta/recipes-support/sass/sassc/0001-Remove-sassc_version.h-from-source-directory.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-support/sass/sassc/0001-Remove-sassc_version.h-from-source-directory.patch b/meta/recipes-support/sass/sassc/0001-Remove-sassc_version.h-from-source-directory.patch new file mode 100644 index 0000000000..c6717995c5 --- /dev/null +++ b/meta/recipes-support/sass/sassc/0001-Remove-sassc_version.h-from-source-directory.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From b5d03d5313d4cc19a7e6e9ba5fd74d1f8400cd46 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Thu, 24 Apr 2025 21:28:55 +0800 | ||
4 | Subject: [PATCH] Remove sassc_version.h from source directory | ||
5 | |||
6 | The sassc_version.h should be generated from sassc_version.h.in. If the | ||
7 | build directory is out of the source directory, the sassc_version.h is | ||
8 | generated in build directory and the original sassc_version.h in source | ||
9 | directory is not overwritten. However, the latter is used during the | ||
10 | build, resulting in a missing runtime version: | ||
11 | |||
12 | $ sassc --version | ||
13 | sassc: [NA] | ||
14 | libsass: [NA] | ||
15 | sass2scss: 1.1.1 | ||
16 | sass: 3.5 | ||
17 | |||
18 | Remove sassc_version.h from source directory to ensure that the | ||
19 | sassc_version.h in build directory is used during the build. | ||
20 | |||
21 | Also remove '--dirty' option from 'git describe' command line in | ||
22 | version.sh to get rid of '-dirty' suffix from version number that | ||
23 | was introduced with this change. | ||
24 | |||
25 | Upstream-Status: Submitted [https://github.com/sass/sassc/pull/283] | ||
26 | |||
27 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
28 | --- | ||
29 | sassc_version.h | 8 -------- | ||
30 | version.sh | 2 +- | ||
31 | 2 files changed, 1 insertion(+), 9 deletions(-) | ||
32 | delete mode 100644 sassc_version.h | ||
33 | |||
34 | diff --git a/sassc_version.h b/sassc_version.h | ||
35 | deleted file mode 100644 | ||
36 | index 3ca12e3..0000000 | ||
37 | --- a/sassc_version.h | ||
38 | +++ /dev/null | ||
39 | @@ -1,8 +0,0 @@ | ||
40 | -#ifndef SASSC_VERSION_H | ||
41 | -#define SASSC_VERSION_H | ||
42 | - | ||
43 | -#ifndef SASSC_VERSION | ||
44 | -#define SASSC_VERSION "[NA]" | ||
45 | -#endif | ||
46 | - | ||
47 | -#endif | ||
48 | diff --git a/version.sh b/version.sh | ||
49 | index d56af99..cf97d82 100755 | ||
50 | --- a/version.sh | ||
51 | +++ b/version.sh | ||
52 | @@ -1,5 +1,5 @@ | ||
53 | if test "x$SASSC_VERSION" = "x"; then | ||
54 | - SASSC_VERSION=`git describe --abbrev=4 --dirty --always --tags 2>/dev/null` | ||
55 | + SASSC_VERSION=`git describe --abbrev=4 --always --tags 2>/dev/null` | ||
56 | fi | ||
57 | if test "x$SASSC_VERSION" = "x"; then | ||
58 | SASSC_VERSION=`cat VERSION 2>/dev/null` | ||
59 | -- | ||
60 | 2.34.1 | ||
61 | |||