NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/nbd: fix static builds

Browse Source 
Fixes:
    http://autobuild.buildroot.org/results/aa8/aa8a1ac35a93e1c8b9fddbc2b5d66ecaa921f31e/ (arm)
    http://autobuild.buildroot.org/results/e5b/e5bd05623dd6c57bb0338592ecd21a5ba0cbe95a/ (arc)
    http://autobuild.buildroot.org/results/e0f/e0fd23eec2dd31bece122d84515b2b7cb14594b8/ (ppc)
    http://autobuild.buildroot.org/results/3a2/3a2d4124f78d4e504e8e961fabe038e570923408/ (mips)
    ...

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2015-08-13 21:55:31 +02:00 committed by Thomas Petazzoni
parent f36ad80b80
commit 6170eaf4c4
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package/nbd/0001-avoid-name-clashing.patch Normal file
View File

@ -0,0 +1,28 @@
rename err() function to avoid clashing with err() form C library
err() is a function available in the C library, so when static linking,
there is a clash at link timebecause the function is provided both by
nbd and the C library:
http://autobuild.buildroot.org/results/aa8/aa8a1ac35a93e1c8b9fddbc2b5d66ecaa921f31e/build-end.log
Fix that by renaming err() to nbd_err() and providing a small maco
wrapper to avoid touching the many call sites.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
Upstream status: hack, not submitted.
diff -durN nbd-3.11.orig/cliserv.h nbd-3.11/cliserv.h
--- nbd-3.11.orig/cliserv.h 2015-05-25 12:27:56.000000000 +0200
+++ nbd-3.11/cliserv.h 2015-08-13 19:28:21.609467505 +0200
@@ -75,7 +75,8 @@
void setmysockopt(int sock);
void err_nonfatal(const char *s);
-void err(const char *s) G_GNUC_NORETURN;
+void nbd_err(const char *s) G_GNUC_NORETURN;
+#define err(S) nbd_err(S)
void logging(const char* name);