Bug 185512

Summary: audio/bmp-flac: Fix build with clang
Product: Ports & Packages Reporter: tkato432
Component: Individual Port(s)Assignee: freebsd-ports-bugs (Nobody) <ports-bugs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description tkato432 2014-01-05 18:10:04 UTC 
- Fix build with clang
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2014-01-19 13:48:29 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-01-19 13:48:37 UTC 
Author: miwi
Date: Sun Jan 19 13:48:29 2014
New Revision: 340295
URL: http://svnweb.freebsd.org/changeset/ports/340295
QAT: https://qat.redports.org/buildarchive/r340295/

Log:
  - Fix build with clang
  
  PR:		185512
  Submitted by:	ports fury

Modified:
  head/audio/bmp-flac/Makefile

Modified: head/audio/bmp-flac/Makefile
==============================================================================
--- head/audio/bmp-flac/Makefile	Sun Jan 19 13:48:03 2014	(r340294)
+++ head/audio/bmp-flac/Makefile	Sun Jan 19 13:48:29 2014	(r340295)
@@ -12,22 +12,33 @@ DISTNAME=	${PORTNAME}-CVS-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FLAC input plugin for beep-media-player
 
-LIB_DEPENDS=	libbeep.so:${PORTSDIR}/multimedia/beep-media-player \
-		libFLAC.so:${PORTSDIR}/audio/flac
+LICENSE=	GPLv2
 
-PLIST_FILES=	lib/bmp/Input/libbmp-flac.so
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libbeep.so:${PORTSDIR}/multimedia/beep-media-player
 
-USES=		iconv pkgconfig
 USE_BZIP2=	yes
+USES=		iconv pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${LOCALBASE}"
-
 MAKEFILE=	${FILESDIR}/Makefile
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_FILES=	lib/bmp/Input/libbmp-flac.so
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "sparc64"
+BROKEN=		Does not compile with GCC 4.2
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/xtra_stdcpp/s|-lstdc++||' ${WRKSRC}/configure
 
 # "obj" is magic to our make(1)
 # make sure we get the new includes from ${LOCALBASE}/include/FLAC
@@ -38,12 +49,7 @@ post-configure:
 # This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/bmp/Input
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/bmp/Input
-	${INSTALL_LIB} ${WRKSRC}/src/plugin_bmp/.libs/libbmp-flac.so ${STAGEDIR}${PREFIX}/lib/bmp/Input
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
+	(cd ${WRKSRC}/src/plugin_bmp/.libs && ${INSTALL_LIB} libbmp-flac.so \
+		${STAGEDIR}${PREFIX}/lib/bmp/Input)
 
 .include <bsd.port.post.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-25 13:08:54 UTC 
Author: miwi
Date: Sat Jan 25 13:08:42 2014
New Revision: 341028
URL: http://svnweb.freebsd.org/changeset/ports/341028
QAT: https://qat.redports.org/buildarchive/r341028/

Log:
  MFH: r340295
  
  - Fix build with clang
  
  PR:		185512
  Submitted by:	ports fury

Modified:
  branches/2014Q1/audio/bmp-flac/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/audio/bmp-flac/Makefile
==============================================================================
--- branches/2014Q1/audio/bmp-flac/Makefile	Sat Jan 25 13:07:26 2014	(r341027)
+++ branches/2014Q1/audio/bmp-flac/Makefile	Sat Jan 25 13:08:42 2014	(r341028)
@@ -12,22 +12,33 @@ DISTNAME=	${PORTNAME}-CVS-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FLAC input plugin for beep-media-player
 
-LIB_DEPENDS=	libbeep.so:${PORTSDIR}/multimedia/beep-media-player \
-		libFLAC.so:${PORTSDIR}/audio/flac
+LICENSE=	GPLv2
 
-PLIST_FILES=	lib/bmp/Input/libbmp-flac.so
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libbeep.so:${PORTSDIR}/multimedia/beep-media-player
 
-USES=		iconv pkgconfig
 USE_BZIP2=	yes
+USES=		iconv pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${LOCALBASE}"
-
 MAKEFILE=	${FILESDIR}/Makefile
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_FILES=	lib/bmp/Input/libbmp-flac.so
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "sparc64"
+BROKEN=		Does not compile with GCC 4.2
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/xtra_stdcpp/s|-lstdc++||' ${WRKSRC}/configure
 
 # "obj" is magic to our make(1)
 # make sure we get the new includes from ${LOCALBASE}/include/FLAC
@@ -38,12 +49,7 @@ post-configure:
 # This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/bmp/Input
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/bmp/Input
-	${INSTALL_LIB} ${WRKSRC}/src/plugin_bmp/.libs/libbmp-flac.so ${STAGEDIR}${PREFIX}/lib/bmp/Input
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
+	(cd ${WRKSRC}/src/plugin_bmp/.libs && ${INSTALL_LIB} libbmp-flac.so \
+		${STAGEDIR}${PREFIX}/lib/bmp/Input)
 
 .include <bsd.port.post.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"