Re: [oe-commits] [meta-openembedded] 03/19: openconnect: add dependency to fix Makefile.am

Re: [oe-commits] [meta-openembedded] 03/19: openconnect: add dependency to fix Makefile.am

[ChenQi]

Hi Martin,

I just realized that this patch is wrong. It actually creates circular 
dependency between main.c and version.c.
Please drop it.
Sorry.

Best Regards,
Chen Qi

On 05/11/2016 06:40 PM, git@opal.openembedded.org wrote:
> martin_jansa pushed a commit to branch master-next
> in repository meta-openembedded.
>
> commit efadf2fce5a3bbf4b7d6f8ee80f2fdfbadc86b06
> Author: Qi.Chen@windriver.com <Qi.Chen@windriver.com>
> AuthorDate: Fri May 6 17:02:17 2016 +0800
>
>      openconnect: add dependency to fix Makefile.am
>      
>      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>
>      Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>   .../0001-Makefile.am-add-missing-dependency.patch  | 28 ++++++++++++++++++++++
>   .../openconnect/openconnect_git.bb                 |  3 ++-
>   2 files changed, 30 insertions(+), 1 deletion(-)
>
> 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"
>   
>