Changeset 2598

Show
Ignore:
Timestamp:
05/22/07 14:18:54 (2 years ago)
Author:
tg
Message:

• mk/pkg-bottom.mk: change BUILD_STYLE and INSTALL_STYLE to allow

for coexistence of several styles, like with CONFIGURE_STYLE

• glib/Makefile, mk/pkg-bottom.mk: make a new INSTALL_STYLE called

“confprog” out of glib's fixup of the pkg-config data files and
the $foo-config scripts

• libxml2: use confprog, bump dashver – fixes neon configure

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/pkg-bottom.mk

    r2596 r2598  
    6060${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE} 
    6161        @env ${MAKE_ENV} ${MAKE} pre-build 
    62 ifeq (${BUILD_STYLE},auto) 
     62ifneq ($(filter auto,${BUILD_STYLE}),) 
    6363        cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ 
    6464            ${MAKE_FLAGS} ${ALL_TARGET} 
    …… 
    8181        @${MAKE} ${_ALL_CONTROLS} 
    8282        @env ${MAKE_ENV} ${MAKE} pre-install 
    83 ifeq (${INSTALL_STYLE},auto) 
     83ifneq ($(filter auto,${INSTALL_STYLE}),) 
    8484        cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ 
    8585            DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} 
    …… 
    8989        @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2 
    9090        @exit 1 
     91endif 
     92ifneq ($(filter confprog,${INSTALL_STYLE}),) 
     93        for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \ 
     94                [[ -e $$a ]] || break; \ 
     95                printf ',g/^prefix=/s,,&${STAGING_DIR},\nwq\n' | ed -s $$a; \ 
     96        done 
     97        @: # not needed at the moment: ',g/-[IL].{/s,-[IL],&${STAGING_DIR},' 
    9198endif 
    9299        @env ${MAKE_ENV} ${MAKE} post-install 

  • trunk/freewrt/package/glib/Makefile

    r2211 r2598  
    4444                        glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" 
    4545BUILD_STYLE=            auto 
    46 INSTALL_STYLE=          auto 
     46INSTALL_STYLE=          auto confprog 
    4747 
    4848post-install: 
    …… 
    5353        ${INSTALL_DIR} ${WRKINST}/usr/include/glib-1.2 
    5454        ${CP} ${WRKBUILD}/glibconfig-sysdefs.h ${WRKINST}/usr/include/glib-1.2/ 
    55         for a in ${WRKINST}/usr/{bin/glib-config,lib/pkgconfig/*.pc}; do \ 
    56                 printf ',g/^prefix=/s,,&${STAGING_DIR},\nwq\n' | ed -s $$a; \ 
    57         done 
    58 #',g/-[IL].{/s,-[IL],&${STAGING_DIR},' |  
    5955 
    6056include ${TOPDIR}/mk/pkg-bottom.mk 

  • trunk/freewrt/package/libxml2/Makefile

    r1686 r2598  
    99PKG_NAME:=              libxml2 
    1010PKG_VERSION:=           2.6.20 
    11 PKG_RELEASE:=           1 
     11PKG_RELEASE:=           2 
    1212PKG_MD5SUM:=            8f0b3ce721bda11401e656b90ba4e78c 
    1313PKG_SOURCE_URL:=        http://xmlsoft.org/sources/ \ 
    …… 
    4848 
    4949BUILD_STYLE=            auto 
    50 INSTALL_STYLE=          auto 
     50INSTALL_STYLE=          auto confprog 
    5151 
    5252post-install: 
    5353        ${INSTALL_DIR} ${IDIR_LIBXML2}/usr/lib 
    5454        ${CP} ${WRKINST}/usr/lib/libxml2.so.* ${IDIR_LIBXML2}/usr/lib/ 
    55         # fixup pkg-config stuff 
    56         ${SED} 's,-I$${includedir}/libxml2,,g' ${WRKINST}/usr/bin/xml2-config 
    57         ${SED} 's,-I$${includedir},,g' ${WRKINST}/usr/bin/xml2-config 
    58         ${SED} 's,-I${STAGING_DIR}/usr/include,,g' ${WRKINST}/usr/bin/xml2-config 
    59         ${SED} 's,-L$${libdir},,g' ${WRKINST}/usr/bin/xml2-config 
    60         ${SED} 's,-L${STAGING_DIR}/usr/lib,,g' ${WRKINST}/usr/bin/xml2-config 
    61         ${SED} 's,-I$${includedir}/libxml2,,g' ${WRKINST}/usr/lib/pkgconfig/libxml-2.0.pc 
    62         ${SED} 's,-L$${libdir},,g' ${WRKINST}/usr/lib/pkgconfig/libxml-2.0.pc 
    6355 
    6456include ${TOPDIR}/mk/pkg-bottom.mk