Show
Ignore:
Timestamp:
04/24/09 22:54:09 (3 years ago)
Author:
sumsum
Message:

Update Apache Portable Runtime to the newest version.
This is required for subversion 1.6.x
configureargs are required for cross compile here *and* in subversion.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/freewrt/package/apr/Config.in

    r2068 r3861  
    1313        default n 
    1414        depends FWRT_PACKAGE_APR 
     15        select FWRT_PACKAGE_LIBPTHREAD 
    1516        help 
    1617          Enable threading support in APR. 
  • trunk/freewrt/package/apr/Makefile

    r3318 r3861  
    88 
    99PKG_NAME:=              apr 
    10 PKG_VERSION:=           0.9.14 
    11 PKG_RELEASE:=           2 
    12 PKG_MD5SUM:=            4ece501c0ae86403db8b4942d7e3458c 
     10PKG_VERSION:=           1.3.3 
     11PKG_RELEASE:=           3 
     12PKG_MD5SUM:=            b254a9abecaedb05efde71daa7517480 
    1313MASTER_SITES:=          http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ 
    1414 
     
    2222CONFIGURE_ENV+=         ac_cv_sizeof_ssize_t=4 
    2323CONFIGURE_ENV+=         ac_cv_file__dev_zero=yes 
     24CONFIGURE_ENV+=         apr_cv_tcp_nodelay_with_cork=no 
     25CONFIGURE_ENV+=         ac_cv_sizeof_off_t='4' \ 
     26                        ac_cv_sizeof_pid_t='4' 
    2427CONFIGURE_ARGS+=        --with-devrandom=/dev/urandom 
     28 
    2529 
    2630ifeq (${FWRT_PACKAGE_APR_THREADING},y) 
     
    3539post-install: 
    3640        ${INSTALL_DIR} ${IDIR_APR}/usr/lib 
    37         ${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/ 
     41        ${CP} ${WRKINST}/usr/lib/libapr-1.so* ${IDIR_APR}/usr/lib/ 
    3842 
    39         ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build 
    40         ${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build
     43        ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1 
     44        ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1
    4145 
    4246        # we need to patch paths to get apr-util compiling 
     
    4751            '/^includedir="/s##&${STAGING_DIR}/#' \ 
    4852            '/^bindir="/s##&${STAGING_DIR}/#' | \ 
    49             ed -s ${WRKINST}/usr/bin/apr-config 
     53            ed -s ${WRKINST}/usr/bin/apr-1-config 
    5054ifeq (${FWRT_PACKAGE_APR_THREADING},y) 
    5155        echo 'Depends: libpthread' >> ${IDIR_APR}/CONTROL/control