Date: Thu, 9 Aug 2012 06:29:43 +0000 (UTC) From: Frederic Culot <culot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r302328 - in head/lang/gcc-aux: . files Message-ID: <201208090629.q796Thlj076163@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: culot Date: Thu Aug 9 06:29:42 2012 New Revision: 302328 URL: http://svn.freebsd.org/changeset/ports/302328 Log: - Update diff-core patch to allow faster symbol matching on FreeBSD>=9 - Fix shared libraries issues by automatically adding rpath to generated binaries - Bump portrevision PR: ports/170439 Submitted by: John Marino <draco@marino.st> (maintainer) Modified: head/lang/gcc-aux/Makefile head/lang/gcc-aux/files/diff-core Modified: head/lang/gcc-aux/Makefile ============================================================================== --- head/lang/gcc-aux/Makefile Thu Aug 9 05:45:13 2012 (r302327) +++ head/lang/gcc-aux/Makefile Thu Aug 9 06:29:42 2012 (r302328) @@ -7,6 +7,7 @@ PORTNAME= gcc-aux PORTVERSION= ${SNAPSHOT} +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://downloads.dragonlace.net/src/:boot \ http://dragonlace.mirrors.ada.cx/src/:boot \ @@ -201,6 +202,12 @@ post-extract: @${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-${suffix} .endfor + # Update LINK_SPEC to add gcc-aux lib runpath in every binary + @${ECHO} "Configuring LINK_SPEC runpath" + @perl -pi -e 's;\@PREFIX\@;${PREFIX};' \ + ${WRKSRC}/gcc/config/i386/freebsd64.h \ + ${WRKSRC}/gcc/config/i386/freebsd.h + .if defined(WITH_STATIC) @${ECHO} "Reconfiguring GCC Makefile to build compiler statically" @${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-static-version Modified: head/lang/gcc-aux/files/diff-core ============================================================================== --- head/lang/gcc-aux/files/diff-core Thu Aug 9 05:45:13 2012 (r302327) +++ head/lang/gcc-aux/files/diff-core Thu Aug 9 06:29:42 2012 (r302328) @@ -199,7 +199,7 @@ +#define UINTPTR_TYPE (LONG_TYPE_SIZE == 64 ? UINT64_TYPE : UINT32_TYPE) --- /dev/null +++ gcc/config/dragonfly.h -@@ -0,0 +1,135 @@ +@@ -0,0 +1,136 @@ +/* Base configuration file for all DragonFly targets. + Copyright (C) 1999, 2000, 2001, 2007, 2008 Free Software Foundation, Inc. + @@ -286,8 +286,9 @@ + %{rdynamic:-export-dynamic} \ + -dynamic-linker %(dfbsd_dynamic_linker) \ + } \ -+ %{static:-Bstatic}} \ -+ %{!static:--hash-style=both} \ ++ %{static:-Bstatic} \ ++ } \ ++ %{!static:--hash-style=both -rpath @PREFIX@/gcc-aux/lib} \ + %{symbolic:-Bsymbolic}" + +#undef LINK_SPEC @@ -572,15 +573,54 @@ + --- gcc/config/i386/freebsd.h.orig +++ gcc/config/i386/freebsd.h -@@ -148,3 +148,5 @@ +@@ -91,6 +91,12 @@ + When the -shared link option is used a final link is not being + done. */ + ++#if FBSD_MAJOR < 9 ++#define ELF_HASH_STYLE "" ++#else ++#define ELF_HASH_STYLE "--hash-style=both " ++#endif ++ + #undef LINK_SPEC + #define LINK_SPEC "\ + %{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \ +@@ -102,6 +108,7 @@ + %{rdynamic:-export-dynamic} \ + -dynamic-linker %(fbsd_dynamic_linker) } \ + %{static:-Bstatic}} \ ++ %{!static:" ELF_HASH_STYLE "-rpath @PREFIX@/gcc-aux/lib} \ + %{symbolic:-Bsymbolic}" + + /* A C statement to output to the stdio stream FILE an assembler +@@ -148,3 +155,5 @@ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack +/* Compile in __enable_execute_stack (void *) (see config.host) */ +#define HAVE_ENABLE_EXECUTE_STACK +--- gcc/config/i386/freebsd64.h.orig ++++ gcc/config/i386/freebsd64.h +@@ -41,4 +41,5 @@ + %{rdynamic:-export-dynamic} \ + -dynamic-linker %(fbsd_dynamic_linker) } \ + %{static:-Bstatic}} \ ++ %{!static:" ELF_HASH_STYLE "-rpath @PREFIX@/gcc-aux/lib} \ + %{symbolic:-Bsymbolic}" --- gcc/config/i386/netbsd-elf.h.orig +++ gcc/config/i386/netbsd-elf.h -@@ -119,3 +119,9 @@ +@@ -38,7 +38,8 @@ + /* Provide a LINK_SPEC appropriate for a NetBSD/i386 ELF target. */ + + #undef LINK_SPEC +-#define LINK_SPEC NETBSD_LINK_SPEC_ELF ++#define LINK_SPEC NETBSD_LINK_SPEC_ELF \ ++"%{!static:-rpath @PREFIX@/gcc-aux/lib}" + + #define NETBSD_ENTRY_POINT "__start" + +@@ -119,3 +120,9 @@ #define DEFAULT_PCC_STRUCT_RETURN 1 #define HAVE_ENABLE_EXECUTE_STACK
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208090629.q796Thlj076163>