[patch] Patch to hylafax-6.0.3.ebuild to fix gcc 4.5 compilation, and other problems

hylafax-6.0.3.ebuild.patch (text/plain), 1.66 KB, created by Kevin Pyle on 2010-08-29 23:53:16 UTC

diff -ru a/hylafax-6.0.3.ebuild b/hylafax-6.0.3.ebuild
--- a/hylafax-6.0.3.ebuild	2010-05-23 18:06:36.000000000 +0000
+++ b/hylafax-6.0.3.ebuild	2010-08-29 23:48:42.026510963 +0000
@@ -38,6 +38,15 @@
 			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
 				"${dir}"/Makefile.in || die "sed failed"
 	done
+	sed -i \
+		-e 's/\${CCF}/& $(USER_LDFLAGS)/' \
+		etc/Makefile.in || die
+	sed -i \
+		-e 's/\${C++}/& $(USER_LDFLAGS)/' \
+		libhylafax/Makefile.LINUXdso || die
+	sed -i \
+		-e '/\${LDFLAGS}/s: : $(USER_LDFLAGS) :' \
+		rules.in faxalter/Makefile.in faxcover/Makefile.in faxd/Makefile.in faxmail/Makefile.in faxrm/Makefile.in faxstat/Makefile.in hfaxd/Makefile.in sendfax/Makefile.in sendpage/Makefile.in sgi2fax/Makefile.in util/Makefile.in || die
 
 	sed -i -e "s|-fpic|-fPIC|g" \
 		configure || die
@@ -45,14 +54,16 @@
 	# new locale stuff lacks DESTDIR
 	sed -i -e "s|\${LOCALEDIR}|\${DESTDIR}\${LOCALEDIR}|g" \
 		po/nls.mk || die
-}
-
-src_configure() {
+	(echo "CC=\"$(tc-getCC)\""; echo "CXX=\"$(tc-getCXX)\"") >> config.site
 	# update TIFF check to allow 3.9.x
 	sed -i \
+		-e 's/libc\.h //' \
 		-e "s|5678|56789|" \
 		-e "s|3.8.|3.9.|" \
 			configure || die
+}
+
+src_configure() {
 
 	local my_conf="
 		--with-DIR_BIN=/usr/bin
@@ -102,14 +113,12 @@
 	#--enable-pam isn't valid
 	use pam || my_conf="${my_conf} $(use_enable pam)"
 
-	myconf="CC=$(tc-getCC) CXX=$(tc-getCXX) ${my_conf}"
-
 	# eval required for quoting in ${my_conf} to work properly, better way?
 	eval ./configure --nointeractive ${my_conf} || die "./configure failed"
 }
 
 src_compile() {
-	emake -j1 || die "emake failed"
+	emake -j1 USER_LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {