summaryrefslogtreecommitdiff
path: root/package/apr/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:03:20 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:03:20 +0100
commit6daa792eab1488d013fefc5eb7e4d01f40f38687 (patch)
tree6391cc46bb9fc8b859d99175ea317e5fa7b37959 /package/apr/Makefile
parentadcaca72539b2ff4a5f4deee00d5f0251378ac9b (diff)
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.
Diffstat (limited to 'package/apr/Makefile')
-rw-r--r--package/apr/Makefile21
1 files changed, 8 insertions, 13 deletions
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