Changeset 40e1e38 in freewrt for package


Ignore:
Timestamp:
Jun 27, 2007, 2:53:56 PM (18 years ago)
Author:
Thorsten Glaser <tg@…>
Children:
2a5614d
Parents:
da336fd
Message:

build with libstdc++ optionally (somehow doesn't work tho)

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2965 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
package
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • package/cxxtools/Config.in

    rda336fd r40e1e38  
    44        default n
    55        select FWRT_PACKAGE_LIBICONV
    6         select FWRT_PACKAGE_UCLIBCXX
    76        select FWRT_PACKAGE_LIBGCC
    87        help
    98          http://www.tntnet.org
    109
     10choice
     11prompt "C++ Configuration"
     12depends on FWRT_PACKAGE_CXXTOOLS
     13
     14config FWRT_PACKAGE_CXXTOOLS_WITH_UCLIBCXX
     15        bool "use uClibc++"
     16        select FWRT_PACKAGE_UCLIBCXX
     17
     18config FWRT_PACKAGE_CXXTOOLS_WITH_LIBSTDCXX
     19        bool "use GCC libstdc++ (huge)"
     20        select FWRT_PACKAGE_LIBSTDCXX
     21
     22endchoice

  • package/cxxtools/Makefile

    rda336fd r40e1e38  
    1111$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
    1212
     13ifeq (${FWRT_PACKAGE_CXXTOOLS_WITH_UCLIBCXX},y)
    1314TCXXFLAGS+=             -fno-builtin -nostdinc++
    1415TLDFLAGS+=              -luClibc++ -liconv -nodefaultlibs
     16DEPENDS=                "libgcc, uclibc++, libiconv"
     17else
     18TCXXFLAGS+=             -fno-builtin -I${STAGING_TOOLS}/include
     19TLDFLAGS+=              -liconv
     20DEPENDS=                "libgcc, libiconv, libstdcxx"
     21endif
     22
    1523CONFIGURE_STYLE:=       gnu
    16 CONFIGURE_ARGS+=        --with-libiconv-prefix="${STAGING_DIR}/usr"
     24CONFIGURE_ARGS+=        --with-libiconv-prefix='${STAGING_DIR}/usr'
    1725BUILD_STYLE:=           auto
    1826INSTALL_STYLE:=         auto confprog
    1927
     28ifeq (${FWRT_PACKAGE_CXXTOOLS_WITH_UCLIBCXX},y)
    2029# add workaround because libtool tries to link libstdc++
    2130post-configure:
    2231        ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
    2332                ${WRKBUILD}/libtool
     33endif
    2434
    2535post-install:
    2636        ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
    2737        ${CP} ${WRKINST}/usr/lib/libcxxtools.so.* ${IDIR_CXXTOOLS}/usr/lib/
     38        echo Depends: ${DEPENDS} >>${IDIR_CXXTOOLS}/CONTROL/control
    2839
    2940include ${TOPDIR}/mk/pkg-bottom.mk

  • package/cxxtools/ipkg/cxxtools.control

    rda336fd r40e1e38  
    22Priority: optional
    33Section: net
    4 Depends: libgcc, uclibc++, libiconv
    54Description: cxxtools

  • package/tntnet/Config.in

    rda336fd r40e1e38  
    33        tristate
    44        default n
    5         select FWRT_PACKAGE_UCLIBCXX
    65        select FWRT_PACKAGE_CXXTOOLS
    76        select FWRT_PACKAGE_LIBICONV

  • package/tntnet/Makefile

    rda336fd r40e1e38  
    1111$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
    1212
    13 SSL:=--without-ssl
    14 ifeq ($(FWRT_COMPILE_TNTNET_WITH_OPENSSL),y)
    15 SSL:=--with-ssl=openssl
    16 PKG_DEPEND+=", libopenssl"
     13ifeq (${FWRT_PACKAGE_CXXTOOLS_WITH_UCLIBCXX},y)
     14TCXXFLAGS+=             -nostdinc++ -nodefaultlibs
     15TLDFLAGS+=              -luClibc++ -liconv -lpthread -lcxxtools -nodefaultlibs
     16DEPENDS=                libgcc, uclibc++, cxxtools, zlib, libpthread, libiconv
     17CONFIGURE_ENV+=         LIBS="-luClibc++ -lz -lpthread -lcxxtools"
     18else
     19TLDFLAGS+=              -liconv -lpthread -lcxxtools
     20DEPENDS=                libgcc, libstdcxx, cxxtools, zlib, libpthread, libiconv
     21CONFIGURE_ENV+=         LIBS="-lz -lpthread -lcxxtools"
    1722endif
    18 ifeq ($(FWRT_COMPILE_TNTNET_WITH_GNUTLS),y)
    19 SSL:=--with-ssl=gnutls
    20 PKG_DEPEND+=", libgnutls"
     23TCXXFLAGS+=             -fno-builtin -L${STAGING_DIR}/usr/lib
     24
     25CONFIGURE_STYLE:=       gnu
     26CONFIGURE_ARGS+=        --without-epoll \
     27                        --without-sdk \
     28                        --without-cgi \
     29                        --without-sendfile
     30ifeq (${FWRT_COMPILE_TNTNET_WITH_OPENSSL},y)
     31CONFIGURE_ARGS+=        --with-ssl=openssl
     32SSL_DEPS=               ", libopenssl"
     33else ifeq (${FWRT_COMPILE_TNTNET_WITH_GNUTLS},y)
     34CONFIGURE_ARGS+=        --with-ssl=gnutls
     35SSL_DEPS=               ", libgnutls"
     36else
     37CONFIGURE_ARGS+=        --without-ssl
    2138endif
    22 
    23 TCXXFLAGS+=             -fno-builtin -nostdinc++
    24 TLDFLAGS+=              -luClibc++ -liconv -lpthread -lcxxtools -nodefaultlibs
    25 CONFIGURE_STYLE:=       gnu
    26 CONFIGURE_ARGS+=        ${SSL} \
    27                         --without-epoll \
    28                         --without-sdk --without-cgi --without-sendfile
    29 CONFIGURE_ENV+=         LIBS="-luClibc++ -lz -lpthread -lcxxtools" \
    30                         CXXFLAGS="${TCXXFLAGS} -nodefaultlibs \
    31                                 -L${STAGING_DIR}/usr/lib" \
     39CONFIGURE_ENV+=         CXXFLAGS='${TCXXFLAGS}' \
    3240                        ac_cv_path_cxxtools_config=${STAGING_DIR}/usr/bin
    3341BUILD_STYLE:=           auto
    3442INSTALL_STYLE:=         auto
    3543
     44ifeq (${FWRT_PACKAGE_CXXTOOLS_WITH_UCLIBCXX},y)
    3645# add workaround because libtool tries to link libstdc++
    3746post-configure:
    3847        ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
    3948            ${WRKBUILD}/libtool
     49endif
    4050
    4151post-install:
    42         ${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet
    43         ${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet.d
    44         ${INSTALL_DIR} ${IDIR_TNTNET}/usr/bin
    45         ${INSTALL_DIR} ${IDIR_TNTNET}/usr/lib
    46         ${INSTALL_DIR} ${IDIR_TNTNET}/usr/lib/tntnet
    47         ${INSTALL_DATA} ${WRKBUILD}/etc/tntnet/tntnet.conf \
    48                 ${IDIR_TNTNET}/etc/tntnet
    49         ${INSTALL_DATA} ${WRKBUILD}/etc/tntnet/tntnet.properties \
    50                 ${IDIR_TNTNET}/etc/tntnet
    51         ${INSTALL_DATA} ${WRKBUILD}/etc/tntnet/mime.conf \
    52                 ${IDIR_TNTNET}/etc/tntnet
    53         ${INSTALL_BIN} ${WRKINST}/usr/bin/tntnet ${IDIR_TNTNET}/usr/bin
    54         ${CP} ${WRKINST}/usr/lib/tntnet/tntnet.so* ${IDIR_TNTNET}/usr/lib/tntnet
    55         ${CP} ${WRKINST}/usr/lib/libtntnet.so.* ${IDIR_TNTNET}/usr/lib
     52        cd ${WRKBUILD} && ${PCP} etc/tntnet/tntnet.{conf,properties} \
     53            etc/tntnet/mime.conf ${IDIR_TNTNET}/
     54        cd ${WRKINST} && ${PCP} usr/bin/tntnet \
     55            usr/lib/tntnet/tntnet.so* usr/lib/libtntnet.so.* \
     56            ${IDIR_TNTNET}/
     57        echo Depends: ${DEPENDS}${SSL_DEPS} >>${IDIR_TNTNET}/CONTROL/control
    5658
    5759include ${TOPDIR}/mk/pkg-bottom.mk

  • package/tntnet/ipkg/tntnet.control

    rda336fd r40e1e38  
    22Priority: optional
    33Section: net
    4 Depends: libgcc, uclibc++, cxxtools, zlib, libpthread, libopenssl, libiconv
    54Description: a modular, multithreaded webapplicationserver
Note: See TracChangeset for help on using the changeset viewer.