Sun Sep 10 17:11:47 2017 UTC ()
Add -fPIC to CFLAGS.

Fixes SSP build, which otherwise breaks in configure:

cc1: warning: command line option '-fpermissive' is valid for C++/ObjC++ but not for C
ld: /var/tmp//ccfWqlYy.o: warning: relocation against `__stack_chk_fail' in readonly section `.text.startup'
ld: /var/tmp//ccfWqlYy.o: relocation R_X86_64_PC32 against symbol `__stack_chk_fail' can not be used when making a shared object; recompile with -fPIC
ld: final link failed: Bad value
configure: failed program was:
#line 10722 "configure"
#include "confdefs.h"

int main() {

; return 0; }
configure: error: --enable-pie requires PIE support from the linker.


(wiz)
diff -r1.18 -r1.19 pkgsrc/security/tor-browser/Makefile
cvs diff -r1.18 -r1.19 pkgsrc/security/tor-browser/Makefile (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/Makefile 2017/09/08 02:38:43 1.18
+++ pkgsrc/security/tor-browser/Makefile 2017/09/10 17:11:47 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.18 2017/09/08 02:38:43 ryoon Exp $ 1# $NetBSD: Makefile,v 1.19 2017/09/10 17:11:47 wiz Exp $
2 2
3TORBVER= 6.0.8 3TORBVER= 6.0.8
4 4
5DISTNAME= v6.0.8-esr45.6.0 5DISTNAME= v6.0.8-esr45.6.0
6PKGNAME= tor-browser-${TORBVER} 6PKGNAME= tor-browser-${TORBVER}
7PKGREVISION= 4 7PKGREVISION= 4
8CATEGORIES= www 8CATEGORIES= www
9# Use OpenBSD distfile 9# Use OpenBSD distfile
10MASTER_SITES= ${MASTER_SITE_OPENBSD:=distfiles/tor-browser/} 10MASTER_SITES= ${MASTER_SITE_OPENBSD:=distfiles/tor-browser/}
11 11
12MAINTAINER= ryoon@NetBSD.org 12MAINTAINER= ryoon@NetBSD.org
13HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en 13HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en
14COMMENT= Tor Browser based on Firefox 14COMMENT= Tor Browser based on Firefox
@@ -31,26 +31,27 @@ SUBST_SED.fix-build-dir+= -e 's,mk_add_o @@ -31,26 +31,27 @@ SUBST_SED.fix-build-dir+= -e 's,mk_add_o
31MOZILLA_DIR= # empty 31MOZILLA_DIR= # empty
32 32
33CONFIGURE_ARGS+= --enable-application=browser 33CONFIGURE_ARGS+= --enable-application=browser
34CONFIGURE_ARGS+= --disable-tor-browser-update 34CONFIGURE_ARGS+= --disable-tor-browser-update
35CONFIGURE_ARGS+= --disable-webrtc 35CONFIGURE_ARGS+= --disable-webrtc
36CONFIGURE_ARGS+= --disable-gio 36CONFIGURE_ARGS+= --disable-gio
37CONFIGURE_ARGS+= --disable-dbus 37CONFIGURE_ARGS+= --disable-dbus
38CONFIGURE_ARGS+= --disable-gnomeui 38CONFIGURE_ARGS+= --disable-gnomeui
39CONFIGURE_ARGS+= --disable-libnotify 39CONFIGURE_ARGS+= --disable-libnotify
40CONFIGURE_ARGS+= --enable-pie 40CONFIGURE_ARGS+= --enable-pie
41CONFIGURE_ARGS+= --enable-tor-data-in-home-dir 41CONFIGURE_ARGS+= --enable-tor-data-in-home-dir
42CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1 42CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1
43CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1 43CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1
 44CFLAGS+= -fPIC
44 45
45# Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601 46# Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601
46CFLAGS+= -fpermissive 47CFLAGS+= -fpermissive
47 48
48# workaround for link of libxul.so etc. 49# workaround for link of libxul.so etc.
49LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/tor-browser ${COMPILER_RPATH_FLAG}${PREFIX}/lib 50LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/tor-browser ${COMPILER_RPATH_FLAG}${PREFIX}/lib
50LDFLAGS.SunOS+= -lm 51LDFLAGS.SunOS+= -lm
51 52
52ALL_ENV+= MOZILLA_PKG_NAME=tor-browser 53ALL_ENV+= MOZILLA_PKG_NAME=tor-browser
53 54
54NOT_PAX_MPROTECT_SAFE+= lib/tor-browser/firefox 55NOT_PAX_MPROTECT_SAFE+= lib/tor-browser/firefox
55NOT_PAX_MPROTECT_SAFE+= lib/tor-browser/firefox-bin 56NOT_PAX_MPROTECT_SAFE+= lib/tor-browser/firefox-bin
56 57