pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/galeon Tweak (ugly) post-buildlink: hack to only o...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fd4c8c65255
branches:  trunk
changeset: 464477:3fd4c8c65255
user:      abs <abs%pkgsrc.org@localhost>
date:      Wed Dec 10 18:22:45 2003 +0000

description:
Tweak (ugly) post-buildlink: hack to only occur if gcc3 is found. Tested on:
    - i386 current (1.6ZE)
    - i386 1.6.2_RC3
    - i386 1.6.2_RC3 with USE_GCC3
Previous version was committed by accident
No change to generated package, only to if package could be generated at all,
so no PKGREVISION change.
Does not fix, but provides a workaround for PR pkg/23053 and PR pkg/23509

diffstat:

 www/galeon/Makefile |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 669b68414004 -r 3fd4c8c65255 www/galeon/Makefile
--- a/www/galeon/Makefile       Wed Dec 10 17:15:04 2003 +0000
+++ b/www/galeon/Makefile       Wed Dec 10 18:22:45 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2003/11/27 15:03:36 abs Exp $
+# $NetBSD: Makefile,v 1.56 2003/12/10 18:22:45 abs Exp $
 
 DISTNAME=      galeon-1.2.13
 CATEGORIES=    www
@@ -53,8 +53,13 @@
 pre-install:
        ${GCONF_PREFIX}/bin/gconftool --shutdown
 
+.if !empty(CC_VERSION:Mgcc-3*)
+# Workaround for gcc3 build issue
 post-buildlink:
-       perl -pi -e 's:(exec \$$cmd):$$1 -lstdc++ -lm:' work/.buildlink/bin/cc
+       ${CP} work/.buildlink/bin/cc work/.buildlink/bin/cc.orig
+       ${SED} 's:\(exec \$$cmd\):\1 -lstdc++ -lm:' work/.buildlink/bin/cc.orig\
+                                               > work/.buildlink/bin/cc
+.endif
 
 post-install:
        ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA_PREFIX@,${MOZILLA_PREFIX},g" ${FILESDIR}/galeon.in > ${PREFIX}/bin/galeon



Home | Main Index | Thread Index | Old Index