diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-25 18:32:07 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-27 11:03:19 +0200 |
| commit | f3e2dd7809b114d3d772a46c7c303716eee0ab77 (patch) | |
| tree | 5e8f22912237b46e54b414bdeeb882dffe41e743 /package/iptraf | |
| parent | 45bf2abc94df0dc4e5e1af41e90137a3cd653e7d (diff) | |
fix various build errors
Diffstat (limited to 'package/iptraf')
| -rw-r--r-- | package/iptraf/Makefile | 19 | ||||
| -rw-r--r-- | package/iptraf/patches/patch-src_Makefile | 8 |
2 files changed, 10 insertions, 17 deletions
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index 6f6a8ce8f..ee33115c9 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -15,32 +15,23 @@ PKG_URL:= http://iptraf.seul.org/ PKG_SITES:= ftp://iptraf.seul.org/pub/iptraf/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +WRKSRC= ${WRKDIST}/src include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPTRAF,iptraf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual -BUILD_STYLE:= manual INSTALL_STYLE:= manual TARGET_CPPFLAGS+= -D_GNU_SOURCE TARGET_LDFLAGS+= -ltinfo - -do-build: - ${MAKE} -C ${WRKBUILD}/src \ - ${TARGET_CONFIGURE_OPTS} \ - CFLAGS="${TARGET_CFLAGS}" \ - DEBUG="" \ - INCLUDEDIR="-I../support -I${STAGING_TARGET_DIR}/usr/include" \ - LDOPTS="${TARGET_LDFLAGS}" \ - PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \ - TARGET="/usr/bin" \ - WORKDIR="/var/lib/iptraf" \ - all +XAKE_FLAGS+= PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \ + TARGET="/usr/bin" \ + WORKDIR="/var/lib/iptraf" do-install: ${INSTALL_DIR} ${IDIR_IPTRAF}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/src/iptraf ${IDIR_IPTRAF}/usr/bin/ + ${INSTALL_BIN} ${WRKBUILD}/iptraf ${IDIR_IPTRAF}/usr/bin/ include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iptraf/patches/patch-src_Makefile b/package/iptraf/patches/patch-src_Makefile index 15af62737..e03ebb770 100644 --- a/package/iptraf/patches/patch-src_Makefile +++ b/package/iptraf/patches/patch-src_Makefile @@ -1,11 +1,13 @@ $Id$ --- iptraf-3.0.1.orig/src/Makefile 2005-09-13 11:11:17.000000000 +0200 -+++ iptraf-3.0.1/src/Makefile 2013-03-04 11:42:11.000000000 +0100 -@@ -18,7 +18,8 @@ VERSION = -DVERSION=\"$(VERNUMBER)\" ++++ iptraf-3.0.1/src/Makefile 2014-06-25 16:51:56.160654472 +0200 +@@ -17,8 +17,9 @@ VERSION = -DVERSION=\"$(VERNUMBER)\" + # BINDIR = ../../iptraf-$(VERNUMBER).bin.$(ARCH) - CC = gcc +-CC = gcc -LIBS = -L../support -ltextbox -lpanel -lncurses # in this order! ++CC ?= gcc +LIBS ?= +LIBS += -ltextbox -lpanel -lncurses # in this order! |