cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r498362

Browse Source 
www/firefox: switch to upstream fix for non-x86

PR:		233707
Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2019-04-08 12:40:01 +00:00
parent 709ae1fdca
commit 72234d27ad
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2019Q2/; revision=498370
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mk/bsd.gecko.mk
View File

@ -138,8 +138,7 @@ MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \
MOZ_EXPORT+= ${CONFIGURE_ENV} \
RUSTFLAGS="${RUSTFLAGS}" \
PERL="${PERL}" \
ac_cv_clock_monotonic=
PERL="${PERL}"
MOZ_OPTIONS+= --prefix="${PREFIX}"
MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}"

59
www/firefox/files/patch-bug1513605 Normal file
View File

@ -0,0 +1,59 @@
commit 7b5468921fef
Author: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue Mar 12 14:14:43 2019 +0000
Bug 1513605 - Add PIC flags when running the clock_gettime(CLOCK_MONOTONIC) check. r=dmajor
Differential Revision: https://phabricator.services.mozilla.com/D23091
--HG--
extra : moz-landing-system : lando
---
js/src/old-configure.in | 3 +++
old-configure.in | 3 +++
2 files changed, 6 insertions(+)
diff --git js/src/old-configure.in js/src/old-configure.in
index 64654df2230b..ce4458098a6c 100644
--- js/src/old-configure.in
+++ js/src/old-configure.in
@@ -1015,7 +1015,9 @@ Darwin)
ac_cv_clock_monotonic,
[for libs in "" -lrt; do
_SAVE_LIBS="$LIBS"
+ _SAVE_CFLAGS="$CFLAGS"
LIBS="$LIBS $libs"
+ CFLAGS="$CFLAGS $DSO_PIC_CFLAGS"
AC_TRY_LINK([#include <time.h>],
[ struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts); ],
@@ -1024,6 +1026,7 @@ Darwin)
break,
ac_cv_clock_monotonic=no)
LIBS="$_SAVE_LIBS"
+ CFLAGS="$_SAVE_CFLAGS"
done])
if test "$ac_cv_clock_monotonic" != "no"; then
HAVE_CLOCK_MONOTONIC=1
diff --git old-configure.in old-configure.in
index d6a587d54b3b..1ed22938205e 100644
--- old-configure.in
+++ old-configure.in
@@ -1303,7 +1303,9 @@ Darwin)
ac_cv_clock_monotonic,
[for libs in "" -lrt; do
_SAVE_LIBS="$LIBS"
+ _SAVE_CFLAGS="$CFLAGS"
LIBS="$LIBS $libs"
+ CFLAGS="$CFLAGS $DSO_PIC_CFLAGS"
AC_TRY_LINK([#include <time.h>],
[ struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts); ],
@@ -1312,6 +1314,7 @@ Darwin)
break,
ac_cv_clock_monotonic=no)
LIBS="$_SAVE_LIBS"
+ CFLAGS="$_SAVE_CFLAGS"
done])
if test "$ac_cv_clock_monotonic" != "no"; then
HAVE_CLOCK_MONOTONIC=1