Changeset f956672


Ignore:
Timestamp:
07/01/13 10:15:40 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
01dd436
Parents:
fa1fd42
Message:

Update grub2 port to latest patch from here:

http://people.freebsd.org/~nox/tmp/grub-2.00-007-zfs.patch

Location:
build-files/ports-overlay/sysutils/grub2
Files:
4 added
1 edited

Legend:

Unmodified
Added
Removed
  • build-files/ports-overlay/sysutils/grub2/Makefile

    r2dfacf2 rf956672  
    11# Created by: sem@FreeBSD.org 
    2 # $FreeBSD$ 
     2# $FreeBSD: sysutils/grub2/Makefile 316596 2013-04-26 10:44:28Z ak $ 
    33 
    44PORTNAME=       grub2 
     
    2323GNU_CONFIGURE=  yes 
    2424USE_GMAKE=      yes 
    25 USES=           bison 
    26 USE_GETTEXT=    yes 
     25USES=           bison gettext 
    2726ONLY_FOR_ARCHS= i386 amd64 
    2827INFO=           grub grub-dev 
     
    3231                LEX=${LOCALBASE}/bin/flex 
    3332 
    34 OPTIONS_DEFINE= MKFONT FUSE ZFS 
     33OPTIONS_DEFINE= MKFONT FUSE 
    3534MKFONT_DESC=    Build grub-mkfont (require freetype2) 
    3635FUSE_DESC=      Build grub-mount (require FUSE) 
     
    7473PLIST_SUB+=     FUSE=${FUSE} 
    7574 
    76 .if ${PORT_OPTIONS:MZFS} 
    77 CPATH=  ${SRC_BASE}/sys/cddl/compat/opensolaris:${SRC_BASE}/cddl/compat/opensolaris/include:${SRC_BASE}/cddl/compat/opensolaris/lib/libumem:${SRC_BASE}/cddl/contrib/opensolaris/lib/libnvpair:${SRC_BASE}/cddl/contrib/opensolaris/lib/libuutil/common:${SRC_BASE}/cddl/contrib/opensolaris/lib/libzfs/common:${SRC_BASE}/cddl/contrib/opensolaris/lib/libzpool/common:${SRC_BASE}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs:${SRC_BASE}/sys/cddl/contrib/opensolaris/uts/common:${SRC_BASE}/sys/cddl/contrib/opensolaris/uts/common/sys:${SRC_BASE}/sys/cddl/contrib/opensolaris/common/zfs:${SRC_BASE}/cddl/contrib/opensolaris/head:${SRC_BASE}/cddl/lib/libumem 
    78 CFLAGS+=        -DB_FALSE=0 -DB_TRUE=1 
    79 CONFIGURE_ENV+= CPATH=${CPATH} 
    80 MAKE_ENV+=      CPATH=${CPATH} 
    81 .endif 
     75# XXX this appears not to be needed or even cause breakage 
     76#.if ${PORT_OPTIONS:MZFS} 
     77#CPATH= ${SRC_BASE}/sys/cddl/compat/opensolaris:${SRC_BASE}/cddl/compat/opensolaris/include:${SRC_BASE}/cddl/compat/opensolaris/lib/libumem:${SRC_BASE}/cddl/contrib/opensolaris/lib/libnvpair:${SRC_BASE}/cddl/contrib/opensolaris/lib/libuutil/common:${SRC_BASE}/cddl/contrib/opensolaris/lib/libzfs/common:${SRC_BASE}/cddl/contrib/opensolaris/lib/libzpool/common:${SRC_BASE}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs:${SRC_BASE}/sys/cddl/contrib/opensolaris/uts/common:${SRC_BASE}/sys/cddl/contrib/opensolaris/uts/common/sys:${SRC_BASE}/sys/cddl/contrib/opensolaris/common/zfs:${SRC_BASE}/cddl/contrib/opensolaris/head:${SRC_BASE}/cddl/lib/libumem 
     78#CFLAGS+=       -DB_FALSE=0 -DB_TRUE=1 
     79#CONFIGURE_ENV+=        CPATH=${CPATH} 
     80#MAKE_ENV+=     CPATH=${CPATH} 
     81#.endif 
    8282 
    8383post-patch: 
     
    8686 
    8787post-configure: 
    88         @${LN} -sf /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core 
     88        @${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core 
    8989 
    9090post-install: 
Note: See TracChangeset for help on using the changeset viewer.