From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/httping/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'package/httping/Makefile') diff --git a/package/httping/Makefile b/package/httping/Makefile index 7d4e0b754..7f0d6add6 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= httping -PKG_VERSION:= 1.3.0 +PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= openssl -PKG_MD5SUM:= 41c912a9ecc904e51d7260053fc2195c +PKG_MD5SUM:= bde1ff3c01343d2371d8f34fbf8a1d9a PKG_DESCR:= Httping is like 'ping' but for http-requests PKG_SECTION:= net PKG_DEPENDS:= libopenssl +PKG_BUILDDEP+= openssl PKG_SITES:= http://www.vanheusden.com/httping/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz @@ -19,11 +19,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -MAKE_FLAGS+= STAGING_DIR=${STAGING_DIR} -BUILD_STYLE:= auto +CONFIG_STYLE:= manual -do-install: - ${INSTALL_DIR} ${IDIR_HTTPING}/usr/sbin - ${CP} ${WRKBUILD}/${PKG_NAME} ${IDIR_HTTPING}/usr/sbin/ +post-install: + ${INSTALL_DIR} ${IDIR_HTTPING}/usr/bin + ${CP} ${WRKINST}/usr/bin/httping ${IDIR_HTTPING}/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 3dc0311e44bddaeaca33b628eedb0ad2007ec27b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Feb 2010 14:32:46 +0100 Subject: fix some compile issues on NetBSD --- package/cbtt/patches/patch-Makefile | 3 +-- package/httping/Makefile | 2 +- package/httping/patches/patch-Makefile | 21 +++++++++++++++++++++ .../kernel-headers/patches/linux-gcc-check.patch | 18 ++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 package/httping/patches/patch-Makefile create mode 100644 toolchain/kernel-headers/patches/linux-gcc-check.patch (limited to 'package/httping/Makefile') diff --git a/package/cbtt/patches/patch-Makefile b/package/cbtt/patches/patch-Makefile index 6701c7e2b..ddcc23d82 100644 --- a/package/cbtt/patches/patch-Makefile +++ b/package/cbtt/patches/patch-Makefile @@ -1,5 +1,5 @@ --- cbtt80-20060211-src.orig/Makefile 2006-02-07 18:44:58.000000000 +0100 -+++ cbtt80-20060211-src/Makefile 2010-02-11 20:13:13.000000000 +0100 ++++ cbtt80-20060211-src/Makefile 2010-02-14 09:21:02.000000000 +0100 @@ -1,10 +1,8 @@ -SHELL = /bin/sh -SYSTEM = $(shell uname) @@ -58,5 +58,4 @@ tracker.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h config.h md5.h server.h sort.h tracker.h util.h tracker_announce.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h link.h tracker.h util.h -tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h -\ No newline at end of file +tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h diff --git a/package/httping/Makefile b/package/httping/Makefile index 7f0d6add6..18a97a85b 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -23,6 +23,6 @@ CONFIG_STYLE:= manual post-install: ${INSTALL_DIR} ${IDIR_HTTPING}/usr/bin - ${CP} ${WRKINST}/usr/bin/httping ${IDIR_HTTPING}/usr/bin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/httping ${IDIR_HTTPING}/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/httping/patches/patch-Makefile b/package/httping/patches/patch-Makefile new file mode 100644 index 000000000..9b7f55b7b --- /dev/null +++ b/package/httping/patches/patch-Makefile @@ -0,0 +1,21 @@ +--- httping-1.4.1.orig/Makefile 2010-01-10 21:35:22.000000000 +0100 ++++ httping-1.4.1/Makefile 2010-02-14 11:30:47.000000000 +0100 +@@ -17,7 +17,7 @@ include version + TARGET=httping + + WFLAGS=-Wall -W +-OFLAGS=-O2 ++OFLAGS= + CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" + + PACKAGE=$(TARGET)-$(VERSION) +@@ -73,9 +73,6 @@ install: $(TARGET) + $(INSTALLMAN) $(MANS) $(DESTDIR)/$(MANDIR)/man1 + $(INSTALLDIR) $(DESTDIR)/$(DOCDIR) + $(INSTALLDOC) $(DOCS) $(DESTDIR)/$(DOCDIR) +-ifneq (DEBUG,yes) +- $(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET) +-endif + + clean: + $(RMDIR) $(OBJS) $(TARGET) *~ core diff --git a/toolchain/kernel-headers/patches/linux-gcc-check.patch b/toolchain/kernel-headers/patches/linux-gcc-check.patch new file mode 100644 index 000000000..7cc381845 --- /dev/null +++ b/toolchain/kernel-headers/patches/linux-gcc-check.patch @@ -0,0 +1,18 @@ +diff -Nur linux-2.6.32.orig/arch/mips/include/asm/sgidefs.h linux-2.6.32/arch/mips/include/asm/sgidefs.h +--- linux-2.6.32.orig/arch/mips/include/asm/sgidefs.h 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/mips/include/asm/sgidefs.h 2010-02-14 11:49:21.000000000 +0100 +@@ -11,14 +11,6 @@ + #define __ASM_SGIDEFS_H + + /* +- * Using a Linux compiler for building Linux seems logic but not to +- * everybody. +- */ +-#ifndef __linux__ +-#error Use a Linux compiler or give up. +-#endif +- +-/* + * Definitions for the ISA levels + * + * With the introduction of MIPS32 / MIPS64 instruction sets definitions -- cgit v1.2.3