Attachment 113629 Details for Bug 155201 – PR155201_3.diff

[patch] PR155201_3.diff

PR155201_3.diff (text/plain), 2.44 KB, created by b. f. on 2011-07-23 10:33:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: b. f.

Created: 2011-07-23 10:33:02 UTC

Size: 2.44 KB

patch

obsolete

>Index: bsd.commands.mk
>===================================================================
>RCS file: /home/pcvs/ports/Mk/bsd.commands.mk,v
>retrieving revision 1.8
>diff -u -r1.8 bsd.commands.mk
>--- bsd.commands.mk	4 May 2011 22:33:13 -0000	1.8
>+++ bsd.commands.mk	21 Jul 2011 21:25:29 -0000
>@@ -78,6 +78,7 @@
> SH?=		/bin/sh
> SORT?=		/usr/bin/sort
> STRIP_CMD?=	/usr/bin/strip
>+STRIPBIN?=	${STRIP_CMD}
> # Command to run commands as privileged user
> # Example: "/usr/local/bin/sudo sh -c" to use "sudo" instead of "su"
> SU_CMD?=	/usr/bin/su root -c
>Index: bsd.port.mk
>===================================================================
>RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
>retrieving revision 1.690
>diff -u -r1.690 bsd.port.mk
>--- bsd.port.mk	21 Jul 2011 15:10:46 -0000	1.690
>+++ bsd.port.mk	21 Jul 2011 21:25:29 -0000
>@@ -1753,18 +1753,22 @@
> 
> .if defined(USE_BINUTILS) && !defined(DISABLE_BINUTILS)
> BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
>-BINUTILS?=	ADDR2LINE AR AS CPPFILT GPROF LD NM OBJCOPY OBJDUMP RANLIB \
>+BINUTILS?=	ADDR2LINE AR AS CPPFILT ELFEDIT GPROF LD NM OBJCOPY OBJDUMP RANLIB \
> 	READELF SIZE STRINGS
>+BINUTILS_NO_CONFIGURE_ENV?=
> BINUTILS_NO_MAKE_ENV?=
> . for b in ${BINUTILS}
> ${b}=	${LOCALBASE}/bin/${b:C/PP/++/:L}
>-.  if defined(GNU_CONFIGURE) || defined(BINUTILS_CONFIGURE)
>+.  if ${BINUTILS_NO_CONFIGURE_ENV:M${b}} == ""
> CONFIGURE_ENV+=	${b}="${${b}}"
> .  endif
> .  if ${BINUTILS_NO_MAKE_ENV:M${b}} == ""
> MAKE_ENV+=	${b}="${${b}}"
> .  endif
> . endfor
>+. if ( defined(WITHOUT_DEBUG) || !defined(WITH_DEBUG) ) && !defined(USE_LINUX)
>+STRIP_CMD=	${LOCALBASE}/bin/strip
>+. endif
> .endif
> 
> .if defined(USE_OPENLDAP) || defined(WANT_OPENLDAP_VER)
>@@ -2278,7 +2282,8 @@
> 			CC="${CC}" CFLAGS="${CFLAGS}" \
> 			CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
> 			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
>-			MANPREFIX="${MANPREFIX}"
>+			MANPREFIX="${MANPREFIX}" \
>+			STRIPBIN="${STRIPBIN}"
> 
> # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.
> # gcc 4.x enable strict aliasing optimization with -O2 which is known to break
>@@ -3784,6 +3789,7 @@
> 	    INSTALL_LIB="${INSTALL_LIB}" \
> 	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
> 	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
>+	    STRIP="${STRIP_CMD}" STRIPBIN="${STRIPBIN}" \
> 	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
> 			 ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
> 			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \

Actions: View | Diff

Attachments on bug 155201: 113628 | 113629