svn commit: r367597 - in head/devel/gcc-arm-embedded: . files

[Lev A. Serebryakov]

Author: lev
Date: Sun Sep  7 18:44:19 2014
New Revision: 367597
URL: http://svnweb.freebsd.org/changeset/ports/367597
QAT: https://qat.redports.org/buildarchive/r367597/

Log:
   (1) Fix build after r366194
   (2) Fix build on FreeBSD/arm. It should be considered as cross-build anyway.

Added:
  head/devel/gcc-arm-embedded/files/patch-src--gcc--gcc--config--arm--arm.h   (contents, props changed)
Modified:
  head/devel/gcc-arm-embedded/Makefile

Modified: head/devel/gcc-arm-embedded/Makefile
==============================================================================
--- head/devel/gcc-arm-embedded/Makefile	Sun Sep  7 18:35:32 2014	(r367596)
+++ head/devel/gcc-arm-embedded/Makefile	Sun Sep  7 18:44:19 2014	(r367597)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gcc-arm-embedded
 PORTVERSION=	4.8.20140609
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q2-update/+download/
 DISTNAME=	${ORIGINAL_PACKAGE_NAME}-src
@@ -73,9 +73,9 @@ BUNDLED_VERSION_CLOOG=		0.18.0
 
 
 VAR_TO_SUBMAKE=	BUILD_DIR CC CFLAGS CHOSEN_COMPILER_TYPE CONFIG_SITE \
-		CONFIGURE_MAX_CMD_LEN CP CPP CPPFLAGS CXX CXXFLAGS \
-		DOCS_SUFFIX ECHO_MSG EXAMPLESDIR FILE FIND GMAKE GREP \
-		MAKE_CMD PATCH \
+		CONFIGURE_MAX_CMD_LEN CONFIGURE_SHELL CP CPP CPPFLAGS CXX \
+		CXXFLAGS DOCS_SUFFIX ECHO_MSG EXAMPLESDIR FILE FIND GMAKE \
+		GREP MAKE_CMD MAKE_SHELL PATCH \
 		INSTALL_MACROS INTERIM_PREFIX INTERIM_WORLD LD LDFLAGS LIBDIR \
 		LN LOCALBASE MAKE_JOBS_NUMBER MKDIR ORIGINAL_PACKAGE_NAME \
 		PORT_OPTIONS PREFIX RM SED SH SRC_DIR STRIP_CMD TAR TARGET \

Added: head/devel/gcc-arm-embedded/files/patch-src--gcc--gcc--config--arm--arm.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gcc-arm-embedded/files/patch-src--gcc--gcc--config--arm--arm.h	Sun Sep  7 18:44:19 2014	(r367597)
@@ -0,0 +1,11 @@
+--- src/gcc/gcc//config/arm/arm.h.orig	2014-05-27 05:44:10.000000000 +0400
++++ src/gcc/gcc//config/arm/arm.h	2014-09-07 22:16:57.000000000 +0400
+@@ -2325,7 +2325,7 @@
+ 
+ /* -mcpu=native handling only makes sense with compiler running on
+    an ARM chip.  */
+-#if defined(__arm__)
++#if defined(__arm__) && !defined(CROSS_DIRECTORY_STRUCTURE)
+ extern const char *host_detect_local_cpu (int argc, const char **argv);
+ # define EXTRA_SPEC_FUNCTIONS						\
+   { "local_cpu_detect", host_detect_local_cpu },