Date: 22 Nov 2009 18:36:59 -0200 From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gnome@FreeBSD.org Subject: ports/140789: [PATCH] x11/yelp: Fix build on systems where GCC stack protection was enabled for userland Message-ID: <20091122203659.39333.qmail@exxodus.fedaykin.here> Resent-Message-ID: <200911222040.nAMKe1mr082185@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140789
>Category: ports
>Synopsis: [PATCH] x11/yelp: Fix build on systems where GCC stack protection was enabled for userland
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 22 20:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Mario Sergio Fujikawa Ferreira
>Release: FreeBSD 8.0-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD exxodus.fedaykin.here 8.0-PRERELEASE FreeBSD 8.0-PRERELEASE #4: Sun Nov 15 10:14:26 BRST 2009
>Description:
- Fix build on systems (FreeBSD 8+) where GCC stack protection (aka
Propolice) was enabled for userland on src/share/mk/bsd.sys.mk
(SVN rev 180012 on 2008-06-25 21:33:28Z by ru)
- For OSVERSION >= 800040, add -fstack-protector to LDFLAGS
>How-To-Repeat:
>Fix:
--- yelp-2.26.0_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/yelp/Makefile,v
retrieving revision 1.66
diff -d -u -u -r1.66 Makefile
--- Makefile 17 Sep 2009 16:55:44 -0000 1.66
+++ Makefile 22 Nov 2009 20:35:06 -0000
@@ -28,11 +28,20 @@
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-gecko=${GECKO} \
--with-gecko-home=${LOCALBASE}/lib/${GECKO}
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
GCONF_SCHEMAS= yelp.schemas
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# Around the time GCC stack protection (aka Propolice) for userland
+# was enabled on src/share/mk/bsd.sys.mk
+# SVN rev 180012 on 2008-06-25 21:33:28Z by ru
+.if ${OSVERSION} >= 800040
+LDFLAGS+= -fstack-protector
+.endif
+
+.include <bsd.port.post.mk>
--- yelp-2.26.0_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091122203659.39333.qmail>