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/asterisk/Makefile | 8 +++++--- package/asterisk/patches/patch-Makefile | 13 +++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 package/asterisk/patches/patch-Makefile (limited to 'package/asterisk') diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 86d311c83..7f042b7f4 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -114,14 +114,13 @@ else CONFIGURE_ARGS+= --without-postgres endif +INSTALL_STYLE:= manual + TLDFLAGS+= -lm -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto MAKE_ENV= ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \ ASTLDFLAGS="${TLDFLAGS}" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ OPTIMIZE="${TARGET_OPTIMIZATION}" \ - CXX="${TARGET_CC}" \ STRIP="${TARGET_CROSS}strip" \ NOISY_BUILD=1 ALL_TARGET:= all install samples @@ -129,6 +128,9 @@ ALL_TARGET:= all install samples pre-configure: cd "$(WRKBUILD)/menuselect"; ./configure +pre-build: + $(MAKE) -C $(WRKBUILD)/menuselect + post-build: cd ${WRKBUILD}/sounds ; \ tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \ diff --git a/package/asterisk/patches/patch-Makefile b/package/asterisk/patches/patch-Makefile new file mode 100644 index 000000000..1ba02c900 --- /dev/null +++ b/package/asterisk/patches/patch-Makefile @@ -0,0 +1,13 @@ +--- asterisk-1.6.2.1.orig/Makefile 2009-12-10 22:04:20.000000000 +0100 ++++ asterisk-1.6.2.1/Makefile 2010-02-05 21:05:41.313084404 +0100 +@@ -366,8 +366,8 @@ makeopts: configure + @exit 1 + + menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) +- menuselect/menuselect --check-deps $@ +- menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) ++ ./menuselect/menuselect --check-deps $@ ++ ./menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) + + $(MOD_SUBDIRS_EMBED_LDSCRIPT): + +@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules -- cgit v1.2.3