From cd97a68da0d94788adba0cc3135969c9f0c9b0f3 Mon Sep 17 00:00:00 2001 From: Daniel Mierswa Date: Fri, 8 Jan 2010 01:29:42 +0100 Subject: [PATCH] No more toolchain-funcs. --- packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0 | 4 +--- packages/app-emulation/qemu/qemu.exlib | 6 ++---- packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0 | 6 +++--- .../jaggedalliance2-stracciatella.exlib | 4 +--- packages/sys-fs/ddrescue/ddrescue-1.11.exheres-0 | 6 +++--- packages/sys-libs/uClibc/uClibc.exlib | 12 +++++------- 6 files changed, 15 insertions(+), 23 deletions(-) diff --git a/packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0 b/packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0 index 7774a36..23260da 100644 --- a/packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0 +++ b/packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0 @@ -1,8 +1,6 @@ # Copyright 2008 Daniel Mierswa # Distributed under the terms of the GNU General Public License v2 -require toolchain-funcs - SUMMARY="BIN -> ISO/WAV Converter" DESCRIPTION=" Convert .bin files into .iso files with a .cue file or try to create .cue @@ -26,7 +24,7 @@ src_unpack() { } src_compile() { - $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o "${SRC}.out" "${FETCHEDDIR}/${SRC}" \ + "${CC}" ${CFLAGS} ${LDFLAGS} -o "${SRC}.out" "${FETCHEDDIR}/${SRC}" \ || die "compilation failed" } diff --git a/packages/app-emulation/qemu/qemu.exlib b/packages/app-emulation/qemu/qemu.exlib index ec3ae4b..12e7aba 100644 --- a/packages/app-emulation/qemu/qemu.exlib +++ b/packages/app-emulation/qemu/qemu.exlib @@ -1,8 +1,6 @@ # Copyright 2008, 2009 Daniel Mierswa # Distributed under the terms of the GNU General Public License v2 -require toolchain-funcs - export_exlib_phases src_prepare src_configure SUMMARY="A generic and open source machine emulator and virtualizer." @@ -68,8 +66,8 @@ qemu_src_configure () ./configure \ --prefix=/usr \ - --host-cc="$(tc-getBUILD_CC)" \ - --cc="$(tc-getCC)" \ + --host-cc="${BUILD_CC}" \ + --cc="${CC}" \ --extra-cflags="$CFLAGS" \ --extra-ldflags="$LDFLAGS" \ --disable-strip \ diff --git a/packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0 b/packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0 index 2bbf8e0..3b50bcb 100644 --- a/packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0 +++ b/packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0 @@ -1,7 +1,7 @@ # Copyright 2009 Daniel Mierswa # Distributed under the terms of the GNU General Public License v2 -require multilib toolchain-funcs +require multilib SUMMARY="Conversion between Unix and MSDOS text files." DESCRIPTION="A text file conversion utility that converts ASCII files between @@ -24,8 +24,8 @@ src_prepare() { default sed \ - -e "/CC =/s:gcc:$(tc-getCC):" \ - -e "/LD =/s:gcc:$(tc-getCC):" \ + -e "/CC =/s:gcc:${CC}:" \ + -e "/LD =/s:gcc:${CC}:" \ -e "/CFLAGS =/s:\$(CDEBUG):$CFLAGS:" \ -e "/LDFLAGS =/s:\$(LDEBUG):$LDFLAGS:" \ -i Makefile || die "sed Makefile failed" diff --git a/packages/games-strategy/jaggedalliance2-stracciatella/jaggedalliance2-stracciatella.exlib b/packages/games-strategy/jaggedalliance2-stracciatella/jaggedalliance2-stracciatella.exlib index 541cbfa..c6ff879 100644 --- a/packages/games-strategy/jaggedalliance2-stracciatella/jaggedalliance2-stracciatella.exlib +++ b/packages/games-strategy/jaggedalliance2-stracciatella/jaggedalliance2-stracciatella.exlib @@ -1,8 +1,6 @@ # Copyright 2009 Daniel Mierswa # Distributed under the terms of the GNU General Public License v2 -require toolchain-funcs - SUMMARY="A tactical role-playing game. Third game of the Jagged Alliance series." DESCRIPTION="A very high rated tactical role-playing game with a big community and lots of modifications." @@ -52,7 +50,7 @@ src_prepare() { option linguas:pl && ja2_config LNG=POLISH option linguas:ru && ja2_config LNG=RUSSIAN option linguas:ru_gold && ja2_config LNG=RUSSIAN_GOLD - ja2_config CC=$(tc-getCC) CXX=$(tc-getCXX) + ja2_config CC="${CC}" CXX="${CXX}" ja2_config PREFIX="${IMAGE}/usr" MANPREFIX="${IMAGE}/usr/share" } diff --git a/packages/sys-fs/ddrescue/ddrescue-1.11.exheres-0 b/packages/sys-fs/ddrescue/ddrescue-1.11.exheres-0 index 05b4d43..d68479c 100644 --- a/packages/sys-fs/ddrescue/ddrescue-1.11.exheres-0 +++ b/packages/sys-fs/ddrescue/ddrescue-1.11.exheres-0 @@ -1,5 +1,5 @@ -require gnu [ suffix=gz ] toolchain-funcs +require gnu [ suffix=gz ] SUMMARY="Data recovery tool trying to rescue as much as possible." @@ -11,8 +11,8 @@ MYOPTIONS="" DEPENDENCIES="" DEFAULT_SRC_CONFIGURE_PARAMS=( - CC=$(tc-getCC) - CXX=$(tc-getCXX) + CC="${CC}" + CXX="${CXX}" CPPFLAGS=${CPPFLAGS} CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} diff --git a/packages/sys-libs/uClibc/uClibc.exlib b/packages/sys-libs/uClibc/uClibc.exlib index 2df5630..09f35a0 100644 --- a/packages/sys-libs/uClibc/uClibc.exlib +++ b/packages/sys-libs/uClibc/uClibc.exlib @@ -1,8 +1,6 @@ # Copyright 2008 Daniel Mierswa # Distributed under the terms of the GNU General Public License v2 -require toolchain-funcs - SUMMARY="A C library for developing embedded Linux systems." DESCRIPTION="A small C library that runs on standard Linux and MMU-less (also known as µClinux) systems with support for alpha, amd64, ARM, Blackfin, @@ -25,10 +23,10 @@ src_compile() { make defconfig make \ - CC=$(tc-getCC) \ - AR=$(tc-getAR) \ - LD=$(tc-getLD) \ - NM=$(tc-getNM) \ - HOSTCC=$(tc-getBUILD_CC) + CC="${CC}" \ + AR="${AR}" \ + LD="${LD}" \ + NM="${NM}" \ + HOSTCC="${BUILD_CC}" }