make allmodconfig work for alix1c eglibc

many upstream package updates, squid, php, asterisk, gnutls, nmap, sqlite, dhcp, git
author: Waldemar Brodkorb <wbx@openadk.org> 2009-08-23 21:41:25 +0200
committer: Waldemar Brodkorb <wbx@openadk.org> 2009-08-23 21:41:25 +0200
commit: 2b198ddc02b3231e43ab8fdddef76ff103a0f5a4 (patch)
tree: 02cda54987930d677beb7ad60b5bf52cb9d67da9
parent: 54893039866e0978bd6563e2b7361f7736341163 (diff)
59 files changed, 31707 insertions, 15473 deletions
diff --git a/TODO b/TODO
index 0726b65f4..75d928964 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,7 @@
 - stripping of kernel is not working for all targets
+- implement a non-interactive allmodconfig for different targets
+  (make TARGET=foo defconfig allmodconfig) 
+  needed for ADK buildserver
 - rescue initramfs image (more archs, generic kernel config )
   - usb boot via stick
 - fix init scripts pidof? vs. killall
diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in
index 72f8b6bca..3cac88628 100644
--- a/package/asterisk/Config.in
+++ b/package/asterisk/Config.in
@@ -1,5 +1,6 @@
 config ADK_PACKAGE_ASTERISK
 	bool "asterisk................... Telephony server"
+	depends on !ADK_LINUX_CRIS_FOXBOARD
         select ADK_PACKAGE_LIBCURL
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBPTHREAD
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index c3f9e0cef..e5a3609a7 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,14 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.26
+PKG_VERSION:=		1.4.26.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f54d6685533a149a0241c3468a88e02a
+PKG_MD5SUM:=		9b46f8628f43e1d3c275460ceee26646
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
 PKG_URL:=		http://www.asterisk.org
-PKG_SITES:=		http://downloads.digium.com/pub/telephony/asterisk/releases/
+PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
 include $(TOPDIR)/mk/package.mk
 
@@ -40,6 +40,11 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+=	asterisk-codec-gsm-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+=	asterisk-pbx-dundi-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+=		asterisk-res-agi-install
 
+#workaround for cris and gcc 4.4, where -Os generates ICE
+ifeq ($(ARCH),cris)
+TARGET_OPTIMIZATION:=$(subst Os,O2,$(TARGET_OPTIMIZATION))
+endif
+
 CONFIGURE_ARGS=		--with-z=${STAGING_DIR}/usr \
 			--with-ncurses=${STAGING_DIR}/usr \
 			--with-ssl=${STAGING_DIR}/usr \
@@ -100,7 +105,7 @@ CONFIGURE_ARGS+=	--without-misdn \
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		STRIP=${STRIP}
 BUILD_STYLE:=		auto
-MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} ${TCFLAGS} -DHAVE_STRTOQ" \
+MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TLDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 			OPTIMIZE="${TARGET_OPTIMIZATION}" \
diff --git a/package/asterisk/patches/patch-codecs_gsm_Makefile b/package/asterisk/patches/patch-codecs_gsm_Makefile
new file mode 100644
index 000000000..82653cc9b
--- /dev/null
+++ b/package/asterisk/patches/patch-codecs_gsm_Makefile
@@ -0,0 +1,66 @@
+disable uname -m checks 
+--- asterisk-1.4.26.orig/codecs/gsm/Makefile	2008-11-19 22:34:47.000000000 +0100
++++ asterisk-1.4.26/codecs/gsm/Makefile	2009-08-21 12:29:21.450418652 +0200
+@@ -37,13 +37,13 @@ WAV49	= -DWAV49
+ ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
+ ######### probably require gcc. 
+ 
+-ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
+-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
+-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
+-OPTIMIZE+=-march=$(PROC)
+-endif
+-endif
+-endif
++#ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
++#ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
++#ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
++#OPTIMIZE+=-march=$(PROC)
++#endif
++#endif
++#endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+ #This works for even old (2.96) versions of gcc and provides a small boost either way.
+@@ -207,13 +207,13 @@ GSM_SOURCES =	$(SRC)/add.c		\
+ # add k6-specific code only if not on a non-k6 hardware or proc.
+ # XXX Keep a space after each findstring argument
+ # XXX should merge with GSM_OBJECTS
+-ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
+-GSM_SOURCES+= $(SRC)/k6opt.s
+-endif
+-endif
+-endif
++#ifeq ($(OSARCH),linux-gnu)
++#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
++#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
++#GSM_SOURCES+= $(SRC)/k6opt.s
++#endif
++#endif
++#endif
+ 
+ TOAST_SOURCES = $(SRC)/toast.c 		\
+ 		$(SRC)/toast_lin.c	\
+@@ -259,13 +259,13 @@ GSM_OBJECTS =	$(SRC)/add.o		\
+ 		$(SRC)/short_term.o	\
+ 		$(SRC)/table.o
+ 
+-ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
+-GSM_OBJECTS+= $(SRC)/k6opt.o
+-endif
+-endif
+-endif
++#ifeq ($(OSARCH),linux-gnu)
++#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
++#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
++#GSM_OBJECTS+= $(SRC)/k6opt.o
++#endif
++#endif
++#endif
+ 
+ TOAST_OBJECTS =	$(SRC)/toast.o 		\
+ 		$(SRC)/toast_lin.o	\
diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree
deleted file mode 100644
index 98c18ec08..000000000
--- a/package/asterisk/patches/patch-menuselect-tree
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/menuselect-tree	2009-04-02 19:44:31.000000000 +0200
-+++ asterisk-1.4.24.1/menuselect-tree	2009-05-12 16:07:12.000000000 +0200
-@@ -59,9 +59,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-menuselect_example_menuselect-tree b/package/asterisk/patches/patch-menuselect_example_menuselect-tree
deleted file mode 100644
index 6c58cc33d..000000000
--- a/package/asterisk/patches/patch-menuselect_example_menuselect-tree
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/menuselect/example_menuselect-tree	2006-08-19 22:55:53.000000000 +0200
-+++ asterisk-1.4.24.1/menuselect/example_menuselect-tree	2009-05-12 16:07:32.000000000 +0200
-@@ -45,8 +45,6 @@
- 		<member name="app_flash" displayname="Flash zap trunk application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>zaptel</depend>
- 		</member>
--		<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--		</member>
- 		<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities." remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- 		</member>
- 		<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index bb3145977..84de63ccb 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -86,6 +86,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-vserver \
 			--enable-wireless \
 			--with-fp-layout=nothing \
+			--without-java \
 			--with-nan-emulation
 
 XAKE_FLAGS+=		LIBS='-lm'
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index 76fdc98e4..c9970fe7a 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -28,7 +28,7 @@ INSTALL_STYLE:=		auto
 pre-configure:
 	(cd ${WRKBUILD}; \
 		env ${CONFIGURE_ENV} \
-		./configure --enable-static \
+		./configure --enable-static --disable-nls \
 			--build=${GNU_HOST_NAME} \
 			--host=${GNU_TARGET_NAME} \
 			--target=${GNU_TARGET_NAME} \
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index c7f223213..38cce03ce 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dhcp
-PKG_VERSION:=		4.1.0
+PKG_VERSION:=		4.1.0p1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1fffed2e8c3d67b111316d6a9b33db7a
+PKG_MD5SUM:=		325ff8338c5a21f89d5304ac13ffebdf
 PKG_DESCR:=		ISC DHCP server
 PKG_SECTION:=		net
 PKG_URL:=		https://www.isc.org/software/dhcp
diff --git a/package/expat/Makefile b/package/expat/Makefile
index 77764a080..532e47068 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=expat/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBEXPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 6f36c1a9f..28bea06bf 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -41,10 +41,10 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/
 	${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/
-ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib
-else
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib
+else
+	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib
 endif
 	rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/include-fixed
 	rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools
diff --git a/package/git/Makefile b/package/git/Makefile
index 9df88b92b..f40cf2449 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.6.3.3
+PKG_VERSION:=		1.6.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a634d76881f3bd6b92cb1892ea5f88fe
+PKG_MD5SUM:=		d16be619150bdab188ba2c269472f496
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		openssl curl
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
index 46b1488e5..c0e2e28ce 100644
--- a/package/git/patches/patch-Makefile
+++ b/package/git/patches/patch-Makefile
@@ -1,16 +1,6 @@
-use symlinks instead of hardlinks
---- git-1.6.3.3.orig/Makefile	2009-06-22 08:24:25.000000000 +0200
-+++ git-1.6.3.3/Makefile	2009-07-24 20:59:26.186421458 +0200
-@@ -215,7 +215,7 @@ bindir_relative = bin
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--gitexecdir = libexec/git-core
-+gitexecdir = bin
- sharedir = $(prefix)/share
- template_dir = share/git-core/templates
- htmldir = share/doc/git-doc
-@@ -1239,7 +1239,6 @@ builtin-help.o: builtin-help.c common-cm
+--- git-1.6.4.1.orig/Makefile	2009-08-22 06:54:01.000000000 +0200
++++ git-1.6.4.1/Makefile	2009-08-23 12:11:07.755226105 +0200
+@@ -1345,7 +1345,6 @@ builtin-help.o: builtin-help.c common-cm
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -18,15 +8,17 @@ use symlinks instead of hardlinks
  	ln -s git$X $@ 2>/dev/null || \
  	cp git$X $@
  
-@@ -1554,11 +1553,9 @@ endif
- 	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
- 	{ $(RM) "$$execdir/git-add$X" && \
+@@ -1663,11 +1662,11 @@ endif
+ 	{ test "$$bindir/" = "$$execdir/" || \
+ 		{ $(RM) "$$execdir/git$X" && \
  		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
--		ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \
- 		cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \
- 	{ for p in $(filter-out git-add$X,$(BUILT_INS)); do \
+-		ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
++		ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
+ 		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
+ 	{ for p in $(BUILT_INS); do \
  		$(RM) "$$execdir/$$p" && \
--		ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \
- 		ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \
- 		cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \
+-		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
++		ln -s "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  	  done; } && \
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 83fe67761..d8d090a6c 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gnutls
-PKG_VERSION:=		2.6.6
+PKG_VERSION:=		2.8.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ca2489e29f9dc313a79b9747bb1090e5
+PKG_MD5SUM:=		72b77092c5d1ae01306cd14c0f22d6e4
 PKG_DESCR:=		GNU TLS library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib
@@ -31,6 +31,7 @@ $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_
 $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR},${PKG_SECTION}))
 
+TCFLAGS+=		-lncurses
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--without-libopencdk-prefix \
 			--without-libz-prefix
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index da706009c..4f5350201 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ipset
 PKG_VERSION:=		3.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		92bb09883dd8a77ec5cfbff1c8932b15
 PKG_DESCR:=		Netfilter ip sets administration utility
 PKG_SECTION:=		net
@@ -17,18 +17,27 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
 
-XAKE_FLAGS+=		V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
-			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
-			LD=$(TARGET_CROSS)gcc
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-INSTALL_TARGET=		binaries_install
+XAKE_FLAGS+=		PREFIX=/usr
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+ALL_TARGET:=		binaries
+INSTALL_TARGET:=	binaries_install
+
+pre-build:
+	V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
+	PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
+	LD=$(TARGET_CROSS)gcc
+	$(MAKE) -C ${WRKBUILD} modules
 
 post-install:
-	${INSTALL_DIR} ${IDIR_IPSET}/usr/sbin
-	${INSTALL_DIR} ${IDIR_IPSET}/usr/lib/ipset
+	${INSTALL_DIR} ${IDIR_IPSET}/usr/sbin ${IDIR_IPSET}/usr/lib/ipset
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/ipset ${IDIR_IPSET}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/ipset/*.so ${IDIR_IPSET}/usr/lib/ipset/
+	# kernel modules (no autoload at the moment)
+	${INSTALL_DIR} ${IDIR_KMOD_IPSET}/lib/modules/${KERNEL_VERSION}/
+	${INSTALL_DATA} ${WRKBUILD}/kernel/*.ko \
+		${IDIR_KMOD_IPSET}/lib/modules/${KERNEL_VERSION}
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index 2217d4244..e84ad6066 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	autotool gnu
 CONFIGURE_ENV+=		LIBPNG12_CONFIG="${STAGING_DIR}/usr/bin/libpng12-config"
 CONFIGURE_ARGS+=	--without-x \
 			--without-freetype \
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index df76ac082..91e1efd11 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -23,7 +23,7 @@ endif
 
 $(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autotool gnu
 CONFIGURE_ENV+=		ac_libnet_have_pf_packet=yes \
 			ac_cv_libnet_endianess=${ENDIAN} \
 			ac_cv_lbl_unaligned_fail=no
diff --git a/package/libnet/patches/patch-Makefile b/package/libnet/patches/patch-Makefile
index 0d15f3a65..b61c0a255 100644
--- a/package/libnet/patches/patch-Makefile
+++ b/package/libnet/patches/patch-Makefile
@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/Makefile	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/Makefile	2009-06-12 21:52:51.000000000 +0200
-@@ -0,0 +1,620 @@
++++ Libnet-1.0.2a/Makefile	2009-08-23 00:40:10.898406314 +0200
+@@ -0,0 +1,638 @@
 +# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# Makefile.  Generated from Makefile.in by configure.
 +
@@ -17,9 +17,9 @@
 +
 +
 +
-+srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
-+top_srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
-+VPATH = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
++srcdir = .
++top_srcdir = .
++
 +pkgdatadir = $(datadir)/libnet
 +pkglibdir = $(libdir)/libnet
 +pkgincludedir = $(includedir)/libnet
@@ -37,7 +37,7 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
-+build_triplet = x86_64-undermydesk-freebsd
++build_triplet = i686-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
 +target_triplet = i586-pc-linux-gnu
 +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -88,31 +88,35 @@
 +AMDEP_FALSE = 
 +AMDEP_TRUE = #
 +AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ar
 +AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoconf
 +AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoheader
 +AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run automake-1.8
 +AWK = gawk
 +BIN_PREFIX = /usr/bin/
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc
 +CCDEPMODE = depmode=none
 +CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -Wall
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E
 +CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
-+ECHO = echo
++DSYMUTIL = 
++DUMPBIN = 
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
-+EGREP = grep -E
++EGREP = /bin/grep -E
 +EXEEXT = 
++FGREP = /bin/grep -F
++GREP = /bin/grep
 +INC_PREFIX = /usr/include/
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++LD = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ld
 +LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
 +LIBNET_CONFIG_CFLAGS = 
 +LIBNET_CONFIG_DEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H -DLIBNET_LIL_ENDIAN
@@ -121,14 +125,20 @@
 +LIBS = 
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LIB_PREFIX = /usr/lib/
-+LL_INT_TYPE = 
-+LL_INT_TYPE_UC = 
++LIPO = 
++LL_INT_TYPE = sockpacket
++LL_INT_TYPE_UC = SOCKPACKET
 +LN = ln
 +LN_S = ln -s
 +LTLIBOBJS = 
 +MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run makeinfo
author	Waldemar Brodkorb <wbx@openadk.org>	2009-08-23 21:41:25 +0200
committer	Waldemar Brodkorb <wbx@openadk.org>	2009-08-23 21:41:25 +0200
commit	2b198ddc02b3231e43ab8fdddef76ff103a0f5a4 (patch)
tree	02cda54987930d677beb7ad60b5bf52cb9d67da9
parent	54893039866e0978bd6563e2b7361f7736341163 (diff)