Skip to contentSkip to conversation

01/44: openconnect: add dependency to fix Makefile.am

oe-commits ChenQi 1 participant 1 message Jul 19, 2016 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

ChenQi

author
#2 lore raw

Hi Martin,

Sorry, but please drop this patch. It's a wrong fix.

The below one is the right fix.
[oe-commits] [meta-openembedded] 02/44: openconnect: fix do_compile failure

Best Regards,
Chen Qi

Quoted 70 lines · On 07/11/2016 09:38 PM, [email protected] wrote:

martin_jansa pushed a commit to branch master-next in repository meta-openembedded.

commit 939c471c5ed2471bf457bf21dc219edde68d1a19
Author: [email protected] <[email protected]>
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

---
  .../0001-Makefile.am-add-missing-dependency.patch  | 28 ++++++++++++++++++++++
  .../openconnect/openconnect_git.bb                 |  3 ++-
  2 files changed, 30 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch new file +28 -0
new file mode 100644
index 0000000..c465bf1
@@ -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 <[email protected]>
+---
+ 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
+
meta-networking/recipes-connectivity/openconnect/openconnect_git.bb +2 -1
index 6d3c252..d8fe439 100644
@@ -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"