[meta-networking][PATCH] openconnect: add dependency to fix Makefile.am

[meta-networking][PATCH] openconnect: add dependency to fix Makefile.am

[Chen Qi]

main.c needs version.c which is generated at build time.
Add this dependency to avoid the following error.

  ../git/main.c:78:21: fatal error: version.c: No such file or directory

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../0001-Makefile.am-add-missing-dependency.patch  | 28 ++++++++++++++++++++++
 .../openconnect/openconnect_git.bb                 |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch

diff --git a/meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch b/meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
new file mode 100644
index 0000000..c465bf1
--- /dev/null
+++ b/meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
@@ -0,0 +1,28 @@
+Upstream-Status: Pending
+
+Subject: Makefile.am: add missing dependency
+
+Add missing dependency to avoid the following error.
+
+  ../git/main.c:78:21: fatal error: version.c: No such file or directory
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index d823e01..ea48ec1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -112,6 +112,7 @@ EXTRA_DIST += $(shell cd "$(top_srcdir)" && \
+ 
+ DISTCLEANFILES = $(pkgconfig_DATA)
+ 
++main.c: version.c
+ main.o: version.c
+ version.c: $(library_srcs) $(lib_openssl_srcs) $(lib_gnutls_srcs) \
+ 	   $(openconnect_SOURCES) Makefile.am configure.ac \
+-- 
+2.8.1
+
diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
index 6d3c252..d8fe439 100644
--- a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
+++ b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
@@ -8,7 +8,8 @@ RDEPENDS_${PN} = "vpnc"
 PV = "7.06"
 
 SRCREV = "35542d52202672b8c12ecc63867432128244013a"
-SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git"
+SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git \
+           file://0001-Makefile.am-add-missing-dependency.patch"
 
 S = "${WORKDIR}/git"
 
-- 
2.8.1

Re: [meta-networking][PATCH] openconnect: add dependency to fix Makefile.am

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 3066 bytes --]

[[oe] [meta-networking][PATCH] openconnect: add dependency to fix Makefile.am] On 16.05.06 (Fri 17:02) Chen Qi wrote:

> main.c needs version.c which is generated at build time.
> Add this dependency to avoid the following error.
> 
>   ../git/main.c:78:21: fatal error: version.c: No such file or directory
> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  .../0001-Makefile.am-add-missing-dependency.patch  | 28 ++++++++++++++++++++++
>  .../openconnect/openconnect_git.bb                 |  3 ++-
>  2 files changed, 30 insertions(+), 1 deletion(-)
>  create mode 100644 meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
> 
> diff --git a/meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch b/meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
> new file mode 100644
> index 0000000..c465bf1
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
> @@ -0,0 +1,28 @@
> +Upstream-Status: Pending

I think you should run this by upstream first, actually.

> +
> +Subject: Makefile.am: add missing dependency
> +
> +Add missing dependency to avoid the following error.
> +
> +  ../git/main.c:78:21: fatal error: version.c: No such file or directory
> +
> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> +---
> + Makefile.am | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index d823e01..ea48ec1 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -112,6 +112,7 @@ EXTRA_DIST += $(shell cd "$(top_srcdir)" && \
> + 
> + DISTCLEANFILES = $(pkgconfig_DATA)
> + 
> ++main.c: version.c

main.c isn't a generated file so this dependency seems meaningless.  The
target we want to build is main.o and the existing target clearly says
we need version.c to exist before main.o can be built.  I don't know how
you'd get a scenario where make thinks all of the dependencies for
main.o have been satisfied but version.c doesn't exist.

-J.

> + main.o: version.c
> + version.c: $(library_srcs) $(lib_openssl_srcs) $(lib_gnutls_srcs) \
> + 	   $(openconnect_SOURCES) Makefile.am configure.ac \
> +-- 
> +2.8.1
> +
> diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> index 6d3c252..d8fe439 100644
> --- a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> +++ b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> @@ -8,7 +8,8 @@ RDEPENDS_${PN} = "vpnc"
>  PV = "7.06"
>  
>  SRCREV = "35542d52202672b8c12ecc63867432128244013a"
> -SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git"
> +SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git \
> +           file://0001-Makefile.am-add-missing-dependency.patch"
>  
>  S = "${WORKDIR}/git"
>  
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]