svn commit: r400697 - head/multimedia/openh264

Jan Beich jbeich at FreeBSD.org
Tue Nov 3 13:01:22 UTC 2015


Author: jbeich
Date: Tue Nov  3 13:01:20 2015
New Revision: 400697
URL: https://svnweb.freebsd.org/changeset/ports/400697

Log:
  multimedia/openh264: oops, drop unused devel/binutils
  
  USE_BINUTILS isn't magically enabled for non-autotools ports.
  One of the following had to be provided
  
    CFLAGS+=	-B${LOCALBASE}/bin
    MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
  
  However, binutils 2.17 in base is enough for NEON with armv6 while
  aarch64 requires recent binutils for everything, not just this port.
  
  PR:		201273 (ping)
  Reported by:	Mikaël Urankar (via private mail)
  MFH:		2015Q4
  X-MFH-With:	r400578

Modified:
  head/multimedia/openh264/Makefile   (contents, props changed)

Modified: head/multimedia/openh264/Makefile
==============================================================================
--- head/multimedia/openh264/Makefile	Tue Nov  3 12:39:16 2015	(r400696)
+++ head/multimedia/openh264/Makefile	Tue Nov  3 13:01:20 2015	(r400697)
@@ -17,7 +17,9 @@ GH_ACCOUNT=	cisco
 USES=		compiler cpe gmake
 CPE_VENDOR=	cisco
 USE_LDCONFIG=	yes
-ASFLAGS+=	${ASFLAGS_${CHOSEN_COMPILER_TYPE}}
+ASFLAGS+=	${ASFLAGS_${MACHINE}_${CHOSEN_COMPILER_TYPE}}
+ASFLAGS_arm_clang=	-no-integrated-as
+ASFLAGS_arm64_clang=	-no-integrated-as
 MAKE_ARGS=	OS=bsd ARCH="${ARCH:S/amd64/x86_64/}" \
 		CCASFLAGS='$$(CFLAGS) ${ASFLAGS}' \
 		CFLAGS_OPT="" CFLAGS_DEBUG=""
@@ -47,13 +49,6 @@ TEST_CFLAGS=	-I${LOCALBASE}/include
 TEST_MAKE_ARGS=	HAVE_GTEST=Yes
 TEST_ALL_TARGET=test
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MDEBUG} && (${ARCH:Maarch*} || ${ARCH:Marm*} )
-USE_BINUTILS=	yes
-ASFLAGS_clang=	-no-integrated-as
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e '/gtest-targets\.mk/d' \
 		-e '/pkgconfig/s/$$(LIBDIR_NAME)/libdata/' \


More information about the svn-ports-all mailing list