mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
23f0219c99
Inlude some musl libraries for transient dependency fix. Port a function from glibc as a replacement for missing on musl. Fixed some of the badness hidden in autotools, legacy types. Fold seds. Closes: https://bugs.gentoo.org/880341 Closes: https://bugs.gentoo.org/713630 Closes: https://bugs.gentoo.org/729906 Signed-off-by: NHOrus <jy6x2b32pie9@yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/36138 Signed-off-by: Sam James <sam@gentoo.org>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
To fix hardcoded library path so stuff works both on 64 and 32 bit systems
|
|
https://bugs.gentoo.org/713630
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -43,11 +43,11 @@
|
|
if cd $withval; then withval=`pwd`; cd $owd; fi
|
|
EVENTINC="-I$withval"
|
|
EVENTLIB="-L$withval -levent"
|
|
- elif test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then
|
|
+ elif test -f $withval/include/event.h -a -f ${libdir}/libevent.a; then
|
|
owd=`pwd`
|
|
if cd $withval; then withval=`pwd`; cd $owd; fi
|
|
EVENTINC="-I$withval/include"
|
|
- EVENTLIB="-L$withval/lib -levent"
|
|
+ EVENTLIB="-L${libdir} -levent"
|
|
else
|
|
AC_ERROR(event.h or libevent.a not found in $withval)
|
|
fi
|
|
@@ -55,7 +55,7 @@
|
|
esac ],
|
|
[ if test -f ${prefix}/include/event.h; then
|
|
EVENTINC="-I${prefix}/include"
|
|
- EVENTLIB="-L${prefix}/lib -levent"
|
|
+ EVENTLIB="-L${libdir} -levent"
|
|
elif test -f /usr/include/event/event.h; then
|
|
EVENTINC="-I/usr/include/event"
|
|
EVENTLIB="-levent"
|
|
was sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -2,7 +2,7 @@
|
|
AC_INIT(res_init.c)
|
|
|
|
AM_INIT_AUTOMAKE(libdnsres,0.1a)
|
|
-AM_CONFIG_HEADER(config.h)
|
|
+AC_CONFIG_HEADERS([config.h])
|
|
AM_MAINTAINER_MODE
|
|
|
|
dnl Initialize prefix.
|