bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/mtr: remove libresolv dependency

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@26188 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul 2011-03-16 11:32:06 +00:00
parent 0d3f5c1e27
commit 564845633b
3 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/mtr/Makefile
View File

@ -17,6 +17,8 @@ PKG_MD5SUM:=fa68528eaec1757f52bacf9fea8c68a9
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/mtr define Package/mtr
@ -41,8 +43,8 @@ endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--without-gtk \ --without-gtk \
CONFIGURE_VARS += \ #CONFIGURE_VARS += \
ac_cv_lib_resolv_res_mkquery=yes \ # ac_cv_lib_resolv_res_mkquery=no \
define Build/Configure define Build/Configure
(cd $(PKG_BUILD_DIR); touch \ (cd $(PKG_BUILD_DIR); touch \

17
net/mtr/patches/520-libresolv_fix.patch Normal file
View File

@ -0,0 +1,17 @@
--- a/configure.in
+++ b/configure.in
@@ -72,10 +72,10 @@ AC_CHECK_FUNC(gethostbyname, ,
AC_CHECK_FUNCS(seteuid)
# AC_CHECK_FUNC(setuid, , AC_MSG_ERROR (I Need either seteuid or setuid))
-AC_CHECK_FUNC(res_mkquery, ,
- AC_CHECK_LIB(bind, res_mkquery, ,
- AC_CHECK_LIB(resolv, res_mkquery, ,
- AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
+#AC_CHECK_FUNC(res_mkquery, ,
+# AC_CHECK_LIB(bind, res_mkquery, ,
+# AC_CHECK_LIB(resolv, res_mkquery, ,
+# AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
# This next line would override the just detected-or-not -lresolv.
# This apparently hurts BSD. And it's bad practise. So it should go.
# However, it probably didn't get added for nothing..... Holler if

29
net/mtr/patches/521-gtk_fix.patch Normal file
View File

@ -0,0 +1,29 @@
--- a/configure.in
+++ b/configure.in
@@ -48,16 +48,16 @@ AC_ARG_ENABLE(ipv6,
[ --disable-ipv6 Do not enable IPv6],
WANTS_IPV6=$enableval, WANTS_IPV6=yes)
-if test "x$WANTS_GTK" = "xyes"; then
- AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS -lm",
- AC_MSG_WARN(Building without GTK2 display support)
- AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
- GTK_OBJ="")
-else
- AC_DEFINE(NO_GTK)
- GTK_OBJ=""
-fi
+#if test "x$WANTS_GTK" = "xyes"; then
+# AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
+# LIBS="$LIBS $GTK_LIBS -lm",
+# AC_MSG_WARN(Building without GTK2 display support)
+# AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
+# GTK_OBJ="")
+#else
+ AC_DEFINE(NO_GTK)
+ GTK_OBJ=""
+#fi
AC_CHECK_FUNC(socket, ,
AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))