diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/apr | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/apr')
| -rw-r--r-- | package/apr/Makefile | 28 | ||||
| -rw-r--r-- | package/apr/ipkg/apr.control | 4 |
2 files changed, 14 insertions, 18 deletions
diff --git a/package/apr/Makefile b/package/apr/Makefile index 8dbddd98b..bfe4f5b8f 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -9,11 +9,18 @@ PKG_NAME:= apr PKG_VERSION:= 0.9.17 PKG_RELEASE:= 1 PKG_MD5SUM:= ca1e22d98081a03a33c2a0b8684eb192 -MASTER_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ +PKG_DESCR:= Apache Portable Runtime library +PKG_SECTION:= libs +PKG_URL:= http://apr.apache.org +PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +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 CONFIGURE_ENV+= ac_cv_func_setpgrp_void=no @@ -35,20 +42,13 @@ 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 - printf '%s\n%s\n%s\n%s\n%s\nwq\n' \ - '/^installbuilddir="/s##&${STAGING_DIR}/#' \ - '/^libdir="/s##&${STAGING_DIR}/#' \ - '/^datadir="/s##&${STAGING_DIR}/#' \ - '/^includedir="/s##&${STAGING_DIR}/#' \ - '/^bindir="/s##&${STAGING_DIR}/#' | \ - ed -s ${WRKINST}/usr/bin/apr-config -ifeq (${ADK_PACKAGE_APR_THREADING},y) - echo 'Depends: libpthread' >> ${IDIR_APR}/CONTROL/control -endif + $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^libdir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^includedir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^bindir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/apr/ipkg/apr.control b/package/apr/ipkg/apr.control deleted file mode 100644 index 8ea0e5e73..000000000 --- a/package/apr/ipkg/apr.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: apr -Priority: optional -Section: lib -Description: Apache Portable Runtime |