Page MenuHomeFreeBSD
Files F142739141

D18677.id52386.diff
No OneTemporary
Actions

D18677.id52386.diff
View Options

Index: base/gcc/Makefile
===================================================================
--- base/gcc/Makefile
+++ base/gcc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gcc
PORTVERSION= 6.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= base
MASTER_SITES= GCC/releases/gcc-${DISTVERSION} \
http://www.mpfr.org/mpfr-3.1.6/:mpfr \
@@ -44,6 +44,7 @@
GCC_VERSION=${PORTVERSION}
EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/freebsd-format-extensions
+EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/freebsd-libdir
EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/patch-gcc-freebsd-mips
GNU_CONFIGURE= yes
Index: devel/powerpc64-gcc/Makefile
===================================================================
--- devel/powerpc64-gcc/Makefile
+++ devel/powerpc64-gcc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gcc
PORTVERSION= 6.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMEPREFIX?= powerpc64-
@@ -30,7 +30,8 @@
.if empty(GCC_TARGET)
# We are building for a FreeBSD target
GCC_TARGET= ${PKGNAMEPREFIX:S/amd64/x86_64/}unknown-${OPSYS:tl}${OSREL}
-EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions
+EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions \
+ ${FILESDIR}/freebsd-libdir
.endif
BU_PREFIX?= ${GCC_TARGET}
@@ -49,9 +50,6 @@
ALL_TARGET?= all-gcc
INSTALL_TARGET?= install-gcc
-
-# Force build of a cross compiler even if the target matches the host.
-CFLAGS+= -DCROSS_DIRECTORY_STRUCTURE
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
Index: devel/powerpc64-gcc/files/freebsd-libdir
===================================================================
--- /dev/null
+++ devel/powerpc64-gcc/files/freebsd-libdir
@@ -0,0 +1,43 @@
+diff --git gcc/config/freebsd.h gcc/config/freebsd.h
+index e7ea42370c5..191e7da2071 100644
+--- gcc/config/freebsd.h
++++ gcc/config/freebsd.h
+@@ -44,6 +44,9 @@ along with GCC; see the file COPYING3. If not see
+ #undef LIB_SPEC
+ #define LIB_SPEC FBSD_LIB_SPEC
+
++#undef STARTFILE_PREFIX_SPEC
++#define STARTFILE_PREFIX_SPEC "/usr/lib/ "
++
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+ #define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
+ #endif
+diff --git gcc/gcc.c gcc/gcc.c
+index f70755679f4..890ef20fd43 100644
+--- gcc/gcc.c
++++ gcc/gcc.c
+@@ -4298,10 +4298,12 @@ process_command (unsigned int decoded_options_count,
+ }
+
+ set_std_prefix (gcc_exec_prefix, len);
++#if 0
+ add_prefix (&exec_prefixes, gcc_libexec_prefix, "GCC",
+ PREFIX_PRIORITY_LAST, 0, 0);
+ add_prefix (&startfile_prefixes, gcc_exec_prefix, "GCC",
+ PREFIX_PRIORITY_LAST, 0, 0);
++#endif
+ }
+
+ /* COMPILER_PATH and LIBRARY_PATH have values
+@@ -4585,9 +4587,11 @@ process_command (unsigned int decoded_options_count,
+ add_prefix (&exec_prefixes,
+ concat (tooldir_prefix, "bin", dir_separator_str, NULL),
+ "BINUTILS", PREFIX_PRIORITY_LAST, 0, 0);
++#if 0
+ add_prefix (&startfile_prefixes,
+ concat (tooldir_prefix, "lib", dir_separator_str, NULL),
+ "BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
++#endif
+ free (tooldir_prefix);
+
+ #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 23, 10:51 PM (8 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27890610
Default Alt Text
D18677.id52386.diff (3 KB)

Event Timeline