mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2025-01-21 11:53:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/sscep: fix linking error

Browse Source 
Apply the patch to fix the following build failure raised since the
addition of the package in commit
72fa60dc10:

uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `__GI_getopt':
getopt.c:(.text+0x598): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here

The patch has been submitted and accepted upstream to address this issue.

Fixes:
 - http://autobuild.buildroot.net/results/844c7dd79f69ef2ea8f293bb73a2d4b7533aa97c

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
[yann.morin.1998@free.fr: do an actual bacport]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Dario Binacchi 2023-01-16 19:05:50 +01:00 committed by Yann E. MORIN
parent af8200a4c3
commit 04fc02a8b7
1 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
package/sscep/0001-Fix-getopt-linking-error.patch Normal file
View File

@ -0,0 +1,57 @@
From 65561b53344b834877e6b63320066a1e26038a3c Mon Sep 17 00:00:00 2001
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Date: Fri, 9 Dec 2022 18:18:27 +0100
Subject: [PATCH] Fix getopt linking error
The buildroot project, to which the sscep application was added, has
configurations that raise the following linking error:
buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os):(.data+0x8): multiple definition of `optind'; src/getopt.o:(.data+0x0): first defined here
buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `__GI_getopt':
getopt.c:(.text+0x5a4): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here
buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `getopt_long':
getopt.c:(.text+0x5b0): multiple definition of `getopt_long'; src/getopt.o:getopt.c:(.text+0x128): first defined here
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:507: sscep] Error 1
make[1]: *** [package/pkg-generic.mk:293: buildroot/output/build/sscep-0.10.0/.stamp_built] Error 2
The patch re-added a check that commit
81f56f635259b9 ("Replaced GNU getopt by a BSD licensed alternative")
removed.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
[yann.morin.1998@free.fr: make that an actual backport]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
src/getopt.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/getopt.c b/src/getopt.c
index eae36a6..0109406 100644
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -31,6 +31,16 @@
#include <stddef.h>
#include <string.h>
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+# include <gnu-versions.h>
+# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+# define ELIDE_CODE
+# endif
+#endif
+
+#ifndef ELIDE_CODE
+
char* optarg;
int optopt;
/* The variable optind [...] shall be initialized to 1 by the system. */
@@ -226,3 +236,5 @@ int getopt_long(int argc, char* const argv[], const char* optstring,
++optind;
return retval;
}
+
+#endif /* Not ELIDE_CODE. */
--
2.25.1