[patch] dosfstools-2.10.ebuild.diff (2)

dosfstools-2.10.ebuild.diff (text/plain), 1.38 KB, created by solar (RETIRED) on 2004-05-13 18:30:13 UTC

Index: dosfstools-2.10.ebuild
===================================================================
RCS file: /home/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.10.ebuild,v
retrieving revision 1.9
diff -u -b -B -w -p -r1.9 dosfstools-2.10.ebuild
--- dosfstools-2.10.ebuild	12 May 2004 13:12:34 -0000	1.9
+++ dosfstools-2.10.ebuild	14 May 2004 01:22:33 -0000
@@ -15,22 +15,19 @@ KEYWORDS="x86 ~ppc sparc ~alpha hppa amd
 DEPEND="virtual/glibc"
 
 src_unpack() {
+	local mr_bones="check our disk ops or mr_bones will hunt us down."
+
 	unpack ${A}; cd ${S}
 	epatch ${FILESDIR}/errno.patch
 	epatch ${FILESDIR}/${P}-2.6.headers.patch
-	sed -i "s:PREFIX\ \=:PREFIX\ \=\ \/usr:" Makefile
-	sed	-i "s:\/usr\/man:\/share\/man:" Makefile
-
-	# Bug: 34785 hardened-gcc transparently adds -fPIC so we must filter 
-	# that away because this package cant cope. (Nov 30 2003 -solar)
-	# has_version 'sys-devel/hardened-gcc' && \
-	#	sed -i -e "s:^DEBUGFLAGS.*:DEBUGFLAGS=-yet_exec:g" Makefile
+	sed -i "s:PREFIX\ \=:PREFIX\ \=\ \/usr:" Makefile || die "${mr_bones}"
+	sed -i "s:\/usr\/man:\/share\/man:" Makefile || die "${mr_bones}"
+	if [ "${ARCH}" == "x86" ]; then
+		sed -i "s:^DEBUGFLAGS.*:DEBUGFLAGS=-fno-pic:g" Makefile || die "${mr_bones}"
+	fi
 }
 
 src_compile() {
-
-	filter-flags -fPIC
-
 	# this package does *not* play well with optimisations
 	# please dont change to: make OPTFLAGS="${CFLAGS}"
 	make || die