[patch] Fixing two Xaw3d issues on amd64-linux

Xaw3d.patch (text/plain), 911 bytes, created by Stefan Hoelldampf on 2008-11-04 15:39:16 UTC

Index: x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild
===================================================================
--- x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild	(revision 33826)
+++ x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild	(working copy)
@@ -63,18 +63,21 @@
 	mkdir ./X11
 	cd ./X11 ; ln -sf ../../Xaw3d . ; cd ..
 
-	xmkmf || die
+	# lib64/ is not available in prefix setups
+	xmkmf -DHaveLib64=NO || die
 	make includes || die
 	make depend || die
 	local extld=
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		extld="-shared"
 		sed -i -e '/PICFLAGS/s/-pic/-fPIC/' Makefile || die "-fPIC"
+		emake CDEBUGFLAGS="${CFLAGS}" \
+			SHLIBLDFLAGS="${LDFLAGS} ${extld}" \
+			LD="$(tc-getCC)" \
+			CC="$(tc-getCC)" || die
+	else
+		emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
 	fi
-	emake CDEBUGFLAGS="${CFLAGS}" \
-		SHLIBLDFLAGS="${LDFLAGS} ${extld}" \
-		LD="$(tc-getCC)" \
-		CC="$(tc-getCC)" || die
 }
 
 src_install() {