Skip to content
Snippets Groups Projects
Commit d4a8c16f authored by Dmitry Sivachenko's avatar Dmitry Sivachenko
Browse files

net/haproxy: fix build on recent -current. 

Submitted by:	brooks
parent f90cebce
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
net/haproxy-devel/files/patch-src_tools.c 0 → 100644
+ 32
− 0
View file @ d4a8c16f
--- src/tools.c.orig
+++ src/tools.c
@@ -17,9 +17,7 @@
#endif
#if defined(__FreeBSD__)
-#include <elf.h>
-#include <dlfcn.h>
-extern void *__elf_aux_vector;
+#include <sys/auxv.h>
#endif
#if defined(__NetBSD__)
@@ -5018,13 +5016,11 @@
if (execfn && execfn != ENOENT)
ret = (const char *)execfn;
#elif defined(__FreeBSD__)
- Elf_Auxinfo *auxv;
- for (auxv = __elf_aux_vector; auxv->a_type != AT_NULL; ++auxv) {
- if (auxv->a_type == AT_EXECPATH) {
- ret = (const char *)auxv->a_un.a_ptr;
- break;
- }
- }
+ static char execpath[MAXPATHLEN];
+ if (execpath[0] == '\0')
+ elf_aux_info(AT_EXECPATH, execpath, MAXPATHLEN);
+ if (execpath[0] != '\0')
+ ret = execpath;
#elif defined(__NetBSD__)
AuxInfo *auxv;
for (auxv = _dlauxinfo(); auxv->a_type != AT_NULL; ++auxv) {
net/haproxy/files/patch-src_tools.c 0 → 100644
+ 32
− 0
View file @ d4a8c16f
--- src/tools.c.orig
+++ src/tools.c
@@ -17,9 +17,7 @@
#endif
#if defined(__FreeBSD__)
-#include <elf.h>
-#include <dlfcn.h>
-extern void *__elf_aux_vector;
+#include <sys/auxv.h>
#endif
#if defined(__NetBSD__)
@@ -5018,13 +5016,11 @@
if (execfn && execfn != ENOENT)
ret = (const char *)execfn;
#elif defined(__FreeBSD__)
- Elf_Auxinfo *auxv;
- for (auxv = __elf_aux_vector; auxv->a_type != AT_NULL; ++auxv) {
- if (auxv->a_type == AT_EXECPATH) {
- ret = (const char *)auxv->a_un.a_ptr;
- break;
- }
- }
+ static char execpath[MAXPATHLEN];
+ if (execpath[0] == '\0')
+ elf_aux_info(AT_EXECPATH, execpath, MAXPATHLEN);
+ if (execpath[0] != '\0')
+ ret = execpath;
#elif defined(__NetBSD__)
AuxInfo *auxv;
for (auxv = _dlauxinfo(); auxv->a_type != AT_NULL; ++auxv) {
net/haproxy25/files/patch-src_tools.c 0 → 100644
+ 32
− 0
View file @ d4a8c16f
--- src/tools.c.orig
+++ src/tools.c
@@ -17,9 +17,7 @@
#endif
#if defined(__FreeBSD__)
-#include <elf.h>
-#include <dlfcn.h>
-extern void *__elf_aux_vector;
+#include <sys/auxv.h>
#endif
#if defined(__NetBSD__)
@@ -5018,13 +5016,11 @@
if (execfn && execfn != ENOENT)
ret = (const char *)execfn;
#elif defined(__FreeBSD__)
- Elf_Auxinfo *auxv;
- for (auxv = __elf_aux_vector; auxv->a_type != AT_NULL; ++auxv) {
- if (auxv->a_type == AT_EXECPATH) {
- ret = (const char *)auxv->a_un.a_ptr;
- break;
- }
- }
+ static char execpath[MAXPATHLEN];
+ if (execpath[0] == '\0')
+ elf_aux_info(AT_EXECPATH, execpath, MAXPATHLEN);
+ if (execpath[0] != '\0')
+ ret = execpath;
#elif defined(__NetBSD__)
AuxInfo *auxv;
for (auxv = _dlauxinfo(); auxv->a_type != AT_NULL; ++auxv) {
net/haproxy26/files/patch-src_tools.c 0 → 100644
+ 32
− 0
View file @ d4a8c16f
--- src/tools.c.orig
+++ src/tools.c
@@ -17,9 +17,7 @@
#endif
#if defined(__FreeBSD__)
-#include <elf.h>
-#include <dlfcn.h>
-extern void *__elf_aux_vector;
+#include <sys/auxv.h>
#endif
#if defined(__NetBSD__)
@@ -5018,13 +5016,11 @@
if (execfn && execfn != ENOENT)
ret = (const char *)execfn;
#elif defined(__FreeBSD__)
- Elf_Auxinfo *auxv;
- for (auxv = __elf_aux_vector; auxv->a_type != AT_NULL; ++auxv) {
- if (auxv->a_type == AT_EXECPATH) {
- ret = (const char *)auxv->a_un.a_ptr;
- break;
- }
- }
+ static char execpath[MAXPATHLEN];
+ if (execpath[0] == '\0')
+ elf_aux_info(AT_EXECPATH, execpath, MAXPATHLEN);
+ if (execpath[0] != '\0')
+ ret = execpath;
#elif defined(__NetBSD__)
AuxInfo *auxv;
for (auxv = _dlauxinfo(); auxv->a_type != AT_NULL; ++auxv) {
net/haproxy27/files/patch-src_tools.c 0 → 100644
+ 32
− 0
View file @ d4a8c16f
--- src/tools.c.orig
+++ src/tools.c
@@ -17,9 +17,7 @@
#endif
#if defined(__FreeBSD__)
-#include <elf.h>
-#include <dlfcn.h>
-extern void *__elf_aux_vector;
+#include <sys/auxv.h>
#endif
#if defined(__NetBSD__)
@@ -5018,13 +5016,11 @@
if (execfn && execfn != ENOENT)
ret = (const char *)execfn;
#elif defined(__FreeBSD__)
- Elf_Auxinfo *auxv;
- for (auxv = __elf_aux_vector; auxv->a_type != AT_NULL; ++auxv) {
- if (auxv->a_type == AT_EXECPATH) {
- ret = (const char *)auxv->a_un.a_ptr;
- break;
- }
- }
+ static char execpath[MAXPATHLEN];
+ if (execpath[0] == '\0')
+ elf_aux_info(AT_EXECPATH, execpath, MAXPATHLEN);
+ if (execpath[0] != '\0')
+ ret = execpath;
#elif defined(__NetBSD__)
AuxInfo *auxv;
for (auxv = _dlauxinfo(); auxv->a_type != AT_NULL; ++auxv) {
net/haproxy28/files/patch-src_tools.c 0 → 100644
+ 32
− 0
View file @ d4a8c16f
--- src/tools.c.orig
+++ src/tools.c
@@ -17,9 +17,7 @@
#endif
#if defined(__FreeBSD__)
-#include <elf.h>
-#include <dlfcn.h>
-extern void *__elf_aux_vector;
+#include <sys/auxv.h>
#endif
#if defined(__NetBSD__)
@@ -5018,13 +5016,11 @@
if (execfn && execfn != ENOENT)
ret = (const char *)execfn;
#elif defined(__FreeBSD__)
- Elf_Auxinfo *auxv;
- for (auxv = __elf_aux_vector; auxv->a_type != AT_NULL; ++auxv) {
- if (auxv->a_type == AT_EXECPATH) {
- ret = (const char *)auxv->a_un.a_ptr;
- break;
- }
- }
+ static char execpath[MAXPATHLEN];
+ if (execpath[0] == '\0')
+ elf_aux_info(AT_EXECPATH, execpath, MAXPATHLEN);
+ if (execpath[0] != '\0')
+ ret = execpath;
#elif defined(__NetBSD__)
AuxInfo *auxv;
for (auxv = _dlauxinfo(); auxv->a_type != AT_NULL; ++auxv) {
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment