From 63b7bb4e9fa93e7bce35774758fc07c7e0a95fba Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 31 Dec 2018 19:12:04 -0200 Subject: [PATCH] codeblocks: remove XBPS_GCC_* usage --- srcpkgs/codeblocks/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index ba8a8da2ae..dd2b31b387 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -3,9 +3,9 @@ pkgname=codeblocks version=17.12 revision=6 build_style=gnu-configure +configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="automake libtool pkg-config zip" makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel" -configure_args="--with-wx-config=wx-config-gtk3" short_desc="Free C, C++ and Fortran IDE" maintainer="Jürgen Buchmüller " license="GPL-3.0-only" @@ -15,14 +15,14 @@ checksum=13881a0a72769694e82e531b8e7814d51fbf1fa122c73c5004e186560fbc57e0 CXXFLAGS="-std=c++11 -fpermissive" -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wxWidgets-devel tinyxml-devel" - configure_args+=" ac_cv_exeext=no cb_cv_gcc_version=$XBPS_GCC_VERSION --with-gnu-ld" + configure_args+=" ac_cv_exeext=no --with-gnu-ld" fi pre_configure() { ./bootstrap - if [ -n "$CROSS_BUILD" ]; then + if [ "$CROSS_BUILD" ]; then # Patch auto_revision's Makefile.am to use the host compiler and flags cd src/build_tools/autorevision sed -i Makefile.am \