[patch] patch against gx86

xvid-1.3.3.ebuild.patch (text/plain), 805 bytes, created by Christoph Junghans (RETIRED) on 2014-11-16 22:37:51 UTC

--- /usr/portage/media-libs/xvid/xvid-1.3.3.ebuild	2014-08-25 05:01:13.000000000 -0600
+++ xvid-1.3.3.ebuild	2014-11-16 15:34:30.872156569 -0700
@@ -24,7 +24,9 @@
 	amd64? ( || ( ${YASM} ${NASM} ) )
 	amd64-fbsd? ( ${NASM} )
 	x86? ( || ( ${YASM} ${NASM} ) )
-	x86-fbsd? ( ${NASM} )"
+	x86-fbsd? ( ${NASM} )
+	x86-macos? ( ${NASM} )
+	x64-macos? ( ${NASM} )"
 RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 S=${WORKDIR}/${MY_PN}/build/generic
@@ -51,6 +53,9 @@
 	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
 		myconf="--disable-assembly"
 	fi
+	# nasm (?) generates a symbol in the data iso text section, in any
+	# case, linker doesn't find it
+	[[ ${CHOST} == x86_64-*-darwin* ]] && myconf="--disable-assembly"
 
 	econf \
 		$(use_enable threads pthread) \