diff mbox series

[2/2,v3] sassc: fix runtime version

Message ID 20250425073757.498411-2-yi.zhao@windriver.com
State New
Headers show
Series [1/2,v3] libsass: fix runtime version | expand

Commit Message

Yi Zhao April 25, 2025, 7:37 a.m. UTC 
The sassc_version.h should be generated from sassc_version.h.in. But
there is already a sassc_version.h file in source directory. When ${S}
!= ${B}, the sassc_version.h is generated in build directory, and the
original sassc_version.h in source directory is not overwritten.
However, the latter is used during the build, resulting in a missing
runtime version. Remove sassc_version.h from source directory to ensure
that the one in build directory is used during the build.

Before the fix:
$ sassc --version
sassc: [NA]
libsass: [NA]
sass2scss: 1.1.1
sass: 3.5

After the fix:
$ sassc  --version
sassc: 3.6.2
libsass: 3.6.6
sass2scss: 1.1.1
sass: 3.5

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 ...assc_version.h-from-source-directory.patch | 61 +++++++++++++++++++
 meta/recipes-support/sass/sassc_git.bb        |  4 +-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/sass/sassc/0001-Remove-sassc_version.h-from-source-directory.patch

Comments

Alexander Kanavin April 25, 2025, 8:11 a.m. UTC | #1 
Thanks, v3 for both patches look good.

Can you review usage of these components in core and meta-oe? Are they
optional or hard dependencies?

Alex

On Fri, 25 Apr 2025 at 09:38, Yi Zhao via lists.openembedded.org
<yi.zhao=eng.windriver.com@lists.openembedded.org> wrote:
>
> The sassc_version.h should be generated from sassc_version.h.in. But
> there is already a sassc_version.h file in source directory. When ${S}
> != ${B}, the sassc_version.h is generated in build directory, and the
> original sassc_version.h in source directory is not overwritten.
> However, the latter is used during the build, resulting in a missing
> runtime version. Remove sassc_version.h from source directory to ensure
> that the one in build directory is used during the build.
>
> Before the fix:
> $ sassc --version
> sassc: [NA]
> libsass: [NA]
> sass2scss: 1.1.1
> sass: 3.5
>
> After the fix:
> $ sassc  --version
> sassc: 3.6.2
> libsass: 3.6.6
> sass2scss: 1.1.1
> sass: 3.5
>
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
>  ...assc_version.h-from-source-directory.patch | 61 +++++++++++++++++++
>  meta/recipes-support/sass/sassc_git.bb        |  4 +-
>  2 files changed, 64 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-support/sass/sassc/0001-Remove-sassc_version.h-from-source-directory.patch
>
> 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 @@
> +From b5d03d5313d4cc19a7e6e9ba5fd74d1f8400cd46 Mon Sep 17 00:00:00 2001
> +From: Yi Zhao <yi.zhao@windriver.com>
> +Date: Thu, 24 Apr 2025 21:28:55 +0800
> +Subject: [PATCH] Remove sassc_version.h from source directory
> +
> +The sassc_version.h should be generated from sassc_version.h.in. If the
> +build directory is out of the source directory, the sassc_version.h is
> +generated in build directory and the original sassc_version.h in source
> +directory is not overwritten. However, the latter is used during the
> +build, resulting in a missing runtime version:
> +
> +$ sassc --version
> +sassc: [NA]
> +libsass: [NA]
> +sass2scss: 1.1.1
> +sass: 3.5
> +
> +Remove sassc_version.h from source directory to ensure that the
> +sassc_version.h in build directory is used during the build.
> +
> +Also remove '--dirty' option from 'git describe' command line in
> +version.sh to get rid of '-dirty' suffix from version number that
> +was introduced with this change.
> +
> +Upstream-Status: Submitted [https://github.com/sass/sassc/pull/283]
> +
> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> +---
> + sassc_version.h | 8 --------
> + version.sh      | 2 +-
> + 2 files changed, 1 insertion(+), 9 deletions(-)
> + delete mode 100644 sassc_version.h
> +
> +diff --git a/sassc_version.h b/sassc_version.h
> +deleted file mode 100644
> +index 3ca12e3..0000000
> +--- a/sassc_version.h
> ++++ /dev/null
> +@@ -1,8 +0,0 @@
> +-#ifndef SASSC_VERSION_H
> +-#define SASSC_VERSION_H
> +-
> +-#ifndef SASSC_VERSION
> +-#define SASSC_VERSION "[NA]"
> +-#endif
> +-
> +-#endif
> +diff --git a/version.sh b/version.sh
> +index d56af99..cf97d82 100755
> +--- a/version.sh
> ++++ b/version.sh
> +@@ -1,5 +1,5 @@
> + if test "x$SASSC_VERSION" = "x"; then
> +-  SASSC_VERSION=`git describe --abbrev=4 --dirty --always --tags 2>/dev/null`
> ++  SASSC_VERSION=`git describe --abbrev=4 --always --tags 2>/dev/null`
> + fi
> + if test "x$SASSC_VERSION" = "x"; then
> +   SASSC_VERSION=`cat VERSION 2>/dev/null`
> +--
> +2.34.1
> +
> diff --git a/meta/recipes-support/sass/sassc_git.bb b/meta/recipes-support/sass/sassc_git.bb
> index b7f57ca244..64e92f48cf 100644
> --- a/meta/recipes-support/sass/sassc_git.bb
> +++ b/meta/recipes-support/sass/sassc_git.bb
> @@ -7,7 +7,9 @@ DEPENDS = "libsass"
>
>  inherit autotools pkgconfig
>
> -SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https"
> +SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https \
> +           file://0001-Remove-sassc_version.h-from-source-directory.patch"
> +
>  SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0"
>  S = "${WORKDIR}/git"
>  PV = "3.6.2"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#215435): https://lists.openembedded.org/g/openembedded-core/message/215435
> Mute This Topic: https://lists.openembedded.org/mt/112447458/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

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 @@ 
+From b5d03d5313d4cc19a7e6e9ba5fd74d1f8400cd46 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Thu, 24 Apr 2025 21:28:55 +0800
+Subject: [PATCH] Remove sassc_version.h from source directory
+
+The sassc_version.h should be generated from sassc_version.h.in. If the
+build directory is out of the source directory, the sassc_version.h is
+generated in build directory and the original sassc_version.h in source
+directory is not overwritten. However, the latter is used during the
+build, resulting in a missing runtime version:
+
+$ sassc --version
+sassc: [NA]
+libsass: [NA]
+sass2scss: 1.1.1
+sass: 3.5
+
+Remove sassc_version.h from source directory to ensure that the
+sassc_version.h in build directory is used during the build.
+
+Also remove '--dirty' option from 'git describe' command line in
+version.sh to get rid of '-dirty' suffix from version number that
+was introduced with this change.
+
+Upstream-Status: Submitted [https://github.com/sass/sassc/pull/283]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ sassc_version.h | 8 --------
+ version.sh      | 2 +-
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+ delete mode 100644 sassc_version.h
+
+diff --git a/sassc_version.h b/sassc_version.h
+deleted file mode 100644
+index 3ca12e3..0000000
+--- a/sassc_version.h
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#ifndef SASSC_VERSION_H
+-#define SASSC_VERSION_H
+-
+-#ifndef SASSC_VERSION
+-#define SASSC_VERSION "[NA]"
+-#endif
+-
+-#endif
+diff --git a/version.sh b/version.sh
+index d56af99..cf97d82 100755
+--- a/version.sh
++++ b/version.sh
+@@ -1,5 +1,5 @@
+ if test "x$SASSC_VERSION" = "x"; then
+-  SASSC_VERSION=`git describe --abbrev=4 --dirty --always --tags 2>/dev/null`
++  SASSC_VERSION=`git describe --abbrev=4 --always --tags 2>/dev/null`
+ fi
+ if test "x$SASSC_VERSION" = "x"; then
+   SASSC_VERSION=`cat VERSION 2>/dev/null`
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/sass/sassc_git.bb b/meta/recipes-support/sass/sassc_git.bb
index b7f57ca244..64e92f48cf 100644
--- a/meta/recipes-support/sass/sassc_git.bb
+++ b/meta/recipes-support/sass/sassc_git.bb
@@ -7,7 +7,9 @@  DEPENDS = "libsass"
 
 inherit autotools pkgconfig
 
-SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https \
+           file://0001-Remove-sassc_version.h-from-source-directory.patch"
+
 SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0"
 S = "${WORKDIR}/git"
 PV = "3.6.2"