Changeset 3861

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-util/Makefile

    r2678 r3861  
    88 
    99PKG_NAME:=              apr-util 
    10 PKG_VERSION:=           0.9.13 
    11 PKG_RELEASE:=           1 
    12 PKG_MD5SUM:=            31e3881af0d9546286b0057717cdb89b 
     10PKG_VERSION:=           1.3.4 
     11PKG_RELEASE:=           2 
     12PKG_MD5SUM:=            a10e2ca150ff07f484c724c36142211f 
    1313MASTER_SITES:=          http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/apr/ 
    1414 
    …… 
    2323BUILD_STYLE:=           auto 
    2424INSTALL_STYLE:=         auto 
    25 XAKE_FLAGS+=            apr_builddir=${STAGING_DIR}/usr/share/build \ 
    26                         apr_builders=${STAGING_DIR}/usr/share/build 
     25XAKE_FLAGS+=            apr_builddir=${STAGING_DIR}/usr/share/build-1 \ 
     26                        apr_builders=${STAGING_DIR}/usr/share/build-1 
    2727 
    2828post-install: 
    2929        ${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib 
    30         ${CP} ${WRKINST}/usr/lib/libaprutil-0.so* ${IDIR_APR_UTIL}/usr/lib/ 
     30        ${CP} ${WRKINST}/usr/lib/libaprutil-1.so* ${IDIR_APR_UTIL}/usr/lib/ 
    3131 
    3232include ${TOPDIR}/mk/pkg-bottom.mk 

  • trunk/freewrt/package/apr-util/patches/patch-uri_Makefile_in

    r1898 r3861  
    1 $FreeWRT$ 
    2 --- apr-util-0.9.13.orig/uri/Makefile.in        2004-11-25 00:45:40.000000000 +0100 
    3 +++ apr-util-0.9.13/uri/Makefile.in     2007-02-07 12:55:37.000000000 +0100 
    4 @@ -3,7 +3,7 @@ VPATH = @srcdir@ 
    5  INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@ -I. 
    6   
    7  TARGETS = uri_delims.h apr_uri.lo 
    8 -CLEAN_TARGETS = gen_uri_delims uri_delims.h 
    9 +CLEAN_TARGETS = gen_uri_delims 
    10   
    11  # bring in rules.mk for standard functionality 
    12  @INCLUDE_RULES@ 
    13 @@ -13,6 +13,3 @@ gen_uri_delims: $(gen_uri_delims_OBJECTS 
    14         $(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS) 
    15   
    16  apr_uri.lo: uri_delims.h apr_uri.c 
    17 - 
    18 -uri_delims.h: gen_uri_delims 
    19 -       ./gen_uri_delims > uri_delims.h 

  • trunk/freewrt/package/apr-util/patches/uri_delim.patch

    r1898 r3861  
    1 diff -Nur apr-util-0.9.13/uri/uri_delims.h build_mipsel/w-apr-util-0.9.13-1/apr-util-0.9.13/uri/uri_delims.h 
    2 --- apr-util-0.9.13/uri/uri_delims.h    1970-01-01 01:00:00.000000000 +0100 
    3 +++ build_mipsel/w-apr-util-0.9.13-1/apr-util-0.9.13/uri/uri_delims.h   2007-02-07 13:06:56.000000000 +0100 
    4 @@ -0,0 +1,16 @@ 
    5 +/* this file is automatically generated by gen_uri_delims, do not edit */ 
    6 +static const unsigned char uri_delims[256] = { 
    7 +    T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    8 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,T_HASH,0,0,0,0, 
    9 +    0,0,0,0,0,0,0,T_SLASH,0,0,0,0,0,0,0,0,0,0,T_COLON,0, 
    10 +    0,0,0,T_QUESTION,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    11 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    12 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    13 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    14 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    15 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    16 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    17 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    18 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
    19 +    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 
    20 +}; 
    21  

  • 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