diff options
Diffstat (limited to 'package/traceroute')
| -rw-r--r-- | package/traceroute/Makefile | 7 | ||||
| -rw-r--r-- | package/traceroute/patches/patch-Make_rules | 28 |
2 files changed, 32 insertions, 3 deletions
diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile index a393f7a30..d8dd55fb0 100644 --- a/package/traceroute/Makefile +++ b/package/traceroute/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= traceroute -PKG_VERSION:= 2.0.11 +PKG_VERSION:= 2.0.16 PKG_RELEASE:= 1 -PKG_MD5SUM:= d400573042d41559fc3e5260275300d8 +PKG_MD5SUM:= 3e84c525cdb4184d64aacaf9225e6503 PKG_DESCR:= Utility to trace the route of IP packets PKG_SECTION:= net PKG_URL:= http://traceroute.sourceforge.net/ @@ -21,11 +21,12 @@ CONFIG_STYLE:= manual MAKE_FLAGS+= CC="${TARGET_CC}" \ AR="${TARGET_CROSS}ar" \ RANLIB="${TARGET_CROSS}ranlib" \ + CFLAGS="${TCFLAGS}" \ LDFLAGS="-L${WRKSRC}/libsupp" post-install: $(INSTALL_DIR) $(IDIR_TRACEROUTE)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/local/bin/traceroute \ + $(INSTALL_BIN) $(WRKINST)/usr/bin/traceroute \ $(IDIR_TRACEROUTE)/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/traceroute/patches/patch-Make_rules b/package/traceroute/patches/patch-Make_rules new file mode 100644 index 000000000..35f8b4003 --- /dev/null +++ b/package/traceroute/patches/patch-Make_rules @@ -0,0 +1,28 @@ +--- traceroute-2.0.16.orig/Make.rules 2010-09-09 16:20:46.000000000 +0200 ++++ traceroute-2.0.16/Make.rules 2010-10-11 20:07:03.000000000 +0200 +@@ -46,14 +46,14 @@ $(call set, INSTALL, cp) + $(call set, INDENT, true) + + gcc = $(findstring gcc,$(CC)) +-$(call set, CFLAGS, $(if $(gcc), -O2 -Wall, -O)) ++$(call set, CFLAGS, ) + $(call set, CPPFLAGS, ) + $(call set, LDFLAGS, -s) + $(call set, LIBS, ) + + + # install stuff +-prefix = /usr/local ++prefix = /usr + + exec_prefix = $(prefix) + bindir = $(exec_prefix)/bin +@@ -125,7 +125,7 @@ _libs = $(strip $(foreach lib,$(LIBDIRS) + $(wildcard $(srcdir)/$(lib)/$(lib).so \ + $(srcdir)/$(lib)/$(lib).a)))) + +-override LIBS := $(_libs) -lm $(LIBS) ++override LIBS := $(_libs) $(LIBS) + + ifneq ($(gcc),) + CPATH = $(subst $(empty) ,:,$(includes)) |