jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

grub: do not override CPP when running make; fixes weird issues reported by many.

Browse source
This commit is contained in:
Juan RP 2013-05-29 20:36:19 +02:00
parent df56b59712
commit de6881f165
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
srcpkgs/grub/template
View file

@ -1,7 +1,7 @@
# Template file for 'grub' # Template file for 'grub'
pkgname=grub pkgname=grub
version="2.00" version=2.00
revision=10 revision=11
short_desc="GRand Unified Bootloader 2" short_desc="GRand Unified Bootloader 2"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3" license="GPL-3"
@ -13,6 +13,8 @@ makedepends="flex libusb-compat-devel ncurses-devel freetype-devel
liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
do_configure() { do_configure() {
unset CC AS LD RANLIB CPP
configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
--enable-grub-mkfont --enable-grub-mount --disable-werror " --enable-grub-mkfont --enable-grub-mount --disable-werror "
@ -35,19 +37,19 @@ do_configure() {
do_build() { do_build() {
msg_normal "Building BIOS grub...\n" msg_normal "Building BIOS grub...\n"
cd $wrksrc/bios_build cd $wrksrc/bios_build
make CPP= ${makejobs} make ${makejobs}
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
msg_normal "Building EFI grub...\n" msg_normal "Building EFI grub...\n"
cd $wrksrc/efi_build cd $wrksrc/efi_build
make CPP= ${makejobs} make ${makejobs}
fi fi
} }
do_install() { do_install() {
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
cd $wrksrc/efi_build cd $wrksrc/efi_build
make CPP= DESTDIR=$DESTDIR/efi install make DESTDIR=$DESTDIR/efi install
# Remove non-platform specific files # Remove non-platform specific files
rm -rf ${DESTDIR}/efi/{boot,etc,usr/{share,bin,sbin}} rm -rf ${DESTDIR}/efi/{boot,etc,usr/{share,bin,sbin}}
rm -f ${DESTDIR}/efi/usr/lib/grub/x86_64-efi/x86_64-* rm -f ${DESTDIR}/efi/usr/lib/grub/x86_64-efi/x86_64-*
@ -56,7 +58,7 @@ do_install() {
rmdir ${DESTDIR}/efi rmdir ${DESTDIR}/efi
fi fi
cd $wrksrc/bios_build cd $wrksrc/bios_build
make CPP= DESTDIR=$DESTDIR install make DESTDIR=$DESTDIR install
# Required to compress info files. # Required to compress info files.
vmkdir usr/share/info vmkdir usr/share/info