Changeset 3116

Show
Ignore:
Timestamp:
07/03/07 19:31:31 (1 year ago)
Author:
tg
Message:

convert libz to BSD make so that it can be compiled on Darwin
also, its configure script sucks major arse

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/vars.mk

    r3114 r3116  
    2626BSDMAKE_FLAGS+=         RTLD_TYPE=GNU STRIP=: INSTALL_STRIP= OBJECT_FMT=ELF 
    2727BSDMAKE_FLAGS+=         OStype=Linux 
     28BSDMAKE_FLAGS+=         HOSTCC='${HOSTCC}' HOSTLDFLAGS='${HOSTLDFLAGS}' \ 
     29                        HOSTCFLAGS='${HOSTCPPFLAGS} ${HOSTCFLAGS}' 
    2830BSDMAKE=                env MAKEFLAGS=V=99 MFLAGS= BSDOBJDIR='${BUILD_DIR}' \ 
    2931                        LD='${TARGET_CROSS}ld' ${BMAKE} ${BSDMAKE_FLAGS} 

  • trunk/freewrt/package/zlib/Makefile

    r2678 r3116  
    99PKG_NAME:=              zlib 
    1010PKG_VERSION:=           1.2.3 
    11 PKG_RELEASE:=           3 
     11PKG_RELEASE:=           4 
    1212PKG_MD5SUM:=            dee233bf288ee795ac96a98cc2e369b6 
    13  
    1413MASTER_SITES:=          http://www.zlib.net/ \ 
    1514                        ${MASTER_SITE_SOURCEFORGE:=zlib/} 
    1615DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2 
    17  
    1816 
    1917include ${TOPDIR}/mk/package.mk 
    …… 
    2119$(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    2220 
    23 CONFIGURE_STYLE:=       manual 
    24 ALL_TARGET:=            libz.a libz.so 
    25 BUILD_STYLE:=           auto 
    26 INSTALL_STYLE:=         auto 
    27  
    28 do-configure: 
    29            (cd $(WRKBUILD); \ 
    30             $(TARGET_CONFIGURE_OPTS) \ 
    31             LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \ 
    32             CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \ 
    33             ./configure \ 
    34             --prefix=/usr \ 
    35             --shared \ 
    36            ); 
     21CONFIGURE_STYLE=        bsd 
     22BUILD_STYLE=            bsd 
     23INSTALL_STYLE=          bsd 
     24INSTALL_TARGET=         install includes 
    3725 
    3826post-install: 
    39         ${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib 
    40         ${CP} ${WRKINST}/usr/lib/libz.so.* ${IDIR_ZLIB}/usr/lib/ 
     27        cd ${WRKINST} && ${PCP} usr/lib/libz.so.* ${IDIR_ZLIB}/ 
    4128 
    4229include ${TOPDIR}/mk/pkg-bottom.mk