Date: Tue, 25 Feb 2014 20:23:28 +0100 From: Juergen Lock <nox@jelal.kn-bremen.de> To: truckman@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org, bug-followup@FreeBSD.org Subject: Re: ports/187017: [patch] multimedia/libxine port fails during configure with clang 3.4 Message-ID: <20140225192328.GA85985@enceladus10.kn-bremen.de> In-Reply-To: <201402250540.s1P5e8VH094020@freefall.freebsd.org> References: <201402250540.s1P5e8VH094020@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--YiEDa0DAkWCtVeE4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Can you try the attached patch? I don't have a head box to test it...
Thanx! :)
Juergen
--YiEDa0DAkWCtVeE4
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="libxine-clang34.patch"
Index: multimedia/libxine/Makefile
===================================================================
--- multimedia/libxine/Makefile (revision 346054)
+++ multimedia/libxine/Makefile (working copy)
@@ -37,7 +37,7 @@ BUILD_DEPENDS+= v4l_compat>=1.0.20100321:${PORTSDI
LIB_DEPENDS+= libdvdcss.so.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
.endif
-USES= gmake iconv pathfix perl5 pkgconfig
+USES= gmake iconv pathfix perl5 pkgconfig compiler:features
USE_XZ= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
@@ -51,7 +51,7 @@ CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS+= -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg
CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 \
--enable-ipv6 \
--with-external-libmad \
@@ -79,8 +79,12 @@ DVDCSS_LIBVERSION= 3
PATCH_DIST_ARGS= -d ${WRKSRC} -p1 --forward --quiet
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+.if ${COMPILER_TYPE} != "clang"
+CFLAGS+= -fno-force-addr
+.endif
+
.if ${ARCH} == "i386"
CFLAGS+= -fomit-frame-pointer
.endif
@@ -222,6 +226,10 @@ CONFIGURE_ARGS+= --disable-vidix
.endif
post-patch:
+.if ${COMPILER_TYPE} == "clang"
+ @${REINPLACE_CMD} -e 's|-fno-rename-registers||' \
+ ${WRKSRC}/src/libw32dll/wine/Makefile.in
+.endif
.if ${PORT_OPTIONS:MVAAPI}
@${REINPLACE_CMD} -e 's|-ldl||' \
${WRKSRC}/src/video_out/Makefile.in
@@ -258,4 +266,4 @@ pre-configure:
s|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
${WRKSRC}/configure
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--YiEDa0DAkWCtVeE4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140225192328.GA85985>