Skip to contentSkip to conversation

openconnect: add dependency to fix Makefile.am

PATCH In review Chen Qi 2 participants 2 messages May 6, 2016 – May 12, 2016

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/1 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(-)
 create mode 100644 meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
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"
 
Signature · 1 line
2.8.1
#1 lore raw
Quoted 18 lines · [[oe] [meta-networking][PATCH] 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(-)
 create mode 100644 meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch new file +0 -0
new file mode 100644
index 0000000..c465bf1

meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch line 1

Quoted 1 line
meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch new file +1 -0
@@ -0,0 +1,28 @@
+Upstream-Status: Pending

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

Quoted 11 lines
meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch new file +11 -0
+
+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(+)

meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch line 22

Quoted 10 lines
meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch new file +10 -0
+
+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.

Quoted 20 lines
meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch new file +6 -0
+ 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"
 
Signature · 2 lines
-Joe MacDonald.
:wq