From 72ea86f8f4d9a00ca5f509eba515b38968924172 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 18 Dec 2009 22:31:15 +0100 Subject: add PKG_BUILDDEP --- package/apr/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/apr/Makefile') diff --git a/package/apr/Makefile b/package/apr/Makefile index bf326d316..24210df59 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 0.9.17 PKG_RELEASE:= 1 PKG_MD5SUM:= ca1e22d98081a03a33c2a0b8684eb192 PKG_DESCR:= Apache Portable Runtime library +PKG_BUILDDEP:= expat apr PKG_SECTION:= libs PKG_URL:= http://apr.apache.org PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ -- cgit v1.2.3 From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:53:46 +0059 Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all Makefiles Signed-off-by: Thorsten Glaser --- package/apr/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package/apr/Makefile') diff --git a/package/apr/Makefile b/package/apr/Makefile index 24210df59..bc9758d8e 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -6,9 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= apr PKG_VERSION:= 0.9.17 PKG_RELEASE:= 1 +ifeq ($(ADK_PACKAGE_APR_THREADING),y) +PKG_BUILDDEP+= libpthread +endif PKG_MD5SUM:= ca1e22d98081a03a33c2a0b8684eb192 PKG_DESCR:= Apache Portable Runtime library -PKG_BUILDDEP:= expat apr PKG_SECTION:= libs PKG_URL:= http://apr.apache.org PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ -- cgit v1.2.3 From 4749aa09f3677a0c92cf8c64bc914887fdde8841 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 18:17:13 +0100 Subject: fix some dependencies and descriptions --- package/apr/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'package/apr/Makefile') diff --git a/package/apr/Makefile b/package/apr/Makefile index bc9758d8e..5a481234f 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -15,6 +15,10 @@ PKG_SECTION:= libs PKG_URL:= http://apr.apache.org PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ +PKG_FLAVOURS= THREADING +PKGFD_FULL= Enable threading support + + include ${TOPDIR}/mk/package.mk ifeq (${ADK_PACKAGE_APR_THREADING},y) -- cgit v1.2.3 From 43255b790d08156bb6474e0ca72c9a3440bd4302 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 6 Jan 2010 18:48:54 +0100 Subject: document and fix setpgrp overwrite not all packages do the right overwrite of this variable. uClibc does not need any arguments to setpgrp function. Finetune package template accordingly. --- package/apr/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/apr/Makefile') diff --git a/package/apr/Makefile b/package/apr/Makefile index 5a481234f..53048e334 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -28,7 +28,8 @@ endif $(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= ac_cv_func_setpgrp_void=no +# uClibc setpgrp does not take arguments +CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes CONFIGURE_ENV+= ac_cv_sizeof_size_t=4 CONFIGURE_ENV+= ac_cv_sizeof_ssize_t=4 CONFIGURE_ENV+= ac_cv_file__dev_zero=yes -- cgit v1.2.3 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/apr/Makefile | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'package/apr/Makefile') diff --git a/package/apr/Makefile b/package/apr/Makefile index 53048e334..486a96842 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -6,12 +6,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= apr PKG_VERSION:= 0.9.17 PKG_RELEASE:= 1 -ifeq ($(ADK_PACKAGE_APR_THREADING),y) -PKG_BUILDDEP+= libpthread -endif PKG_MD5SUM:= ca1e22d98081a03a33c2a0b8684eb192 PKG_DESCR:= Apache Portable Runtime library PKG_SECTION:= libs +ifeq ($(ADK_PACKAGE_APR_THREADING),y) +PKG_DEPENDS:= libpthread +PKG_BUILDDEP+= libpthread +endif PKG_URL:= http://apr.apache.org PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ @@ -21,13 +22,8 @@ PKGFD_FULL= Enable threading support include ${TOPDIR}/mk/package.mk -ifeq (${ADK_PACKAGE_APR_THREADING},y) -PKG_DEPENDS:= libpthread -endif - $(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes CONFIGURE_ENV+= ac_cv_sizeof_size_t=4 @@ -43,16 +39,15 @@ else CONFIGURE_ARGS+= --disable-threads endif -BUILD_STYLE:= auto -INSTALL_STYLE:= auto - post-install: ${INSTALL_DIR} ${IDIR_APR}/usr/lib ${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/ ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build ${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/ # we need to patch paths to get apr-util compiling - $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config - $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \ + ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \ + ${WRKINST}/usr/bin/apr-config include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3