svn commit: r539972 - in head: Mk www/firefox www/firefox/files

[Craig Leres]

On 2020-06-23 04:48, Jan Beich wrote:
> Author: jbeich
> Date: Tue Jun 23 11:48:39 2020
> New Revision: 539972
> URL: https://svnweb.freebsd.org/changeset/ports/539972
> 
> Log:
>   www/firefox: update to 78.0

This version doesn't build for me (11.3-RELEASE-p10 and my options are
appended):


/wrkdirs/usr/ports/www/firefox/work/firefox-78.0/mozglue/baseprofiler/core/shared-libraries-linux.cc:377:34:
error:
          use of undeclared identifier 'NT_GNU_BUILD_ID'
          if (note_header->n_type == NT_GNU_BUILD_ID) break;

I can see NT_GNU_BUILD_ID being defined in
mozglue/baseprofiler/lul/LulElfInt.h but only when GP_OS_android is
defined. A few other module have the same issue; I worked around with
the ifdef in the attached patches.

		Craig

zinc 501 # fgrep _SET
/usr/local/etc/poudriere.d/current-patched-options/www_firefox/options
OPTIONS_FILE_SET+=DBUS
OPTIONS_FILE_SET+=FFMPEG
OPTIONS_FILE_SET+=OPTIMIZED_CFLAGS
OPTIONS_FILE_SET+=ALSA
-------------- next part --------------
--- mozglue/baseprofiler/core/shared-libraries-linux.cc.orig	2020-06-25 02:45:02 UTC
+++ mozglue/baseprofiler/core/shared-libraries-linux.cc
@@ -371,7 +371,9 @@ class FileID {
     const void* section_end = reinterpret_cast<const char*>(section) + length;
     const Nhdr* note_header = reinterpret_cast<const Nhdr*>(section);
     while (reinterpret_cast<const void*>(note_header) < section_end) {
+#ifdef NT_GNU_BUILD_ID
       if (note_header->n_type == NT_GNU_BUILD_ID) break;
+#endif
       note_header = reinterpret_cast<const Nhdr*>(
           reinterpret_cast<const char*>(note_header) + sizeof(Nhdr) +
           NOTE_PADDING(note_header->n_namesz) +
-------------- next part --------------
--- mozglue/baseprofiler/lul/LulElf.cpp.orig	2020-06-25 03:10:10 UTC
+++ mozglue/baseprofiler/lul/LulElf.cpp
@@ -759,7 +759,9 @@ static bool ElfClassBuildIDNoteIdentifie
   const void* section_end = reinterpret_cast<const char*>(section) + length;
   const Nhdr* note_header = reinterpret_cast<const Nhdr*>(section);
   while (reinterpret_cast<const void*>(note_header) < section_end) {
+#ifdef NT_GNU_BUILD_ID
     if (note_header->n_type == NT_GNU_BUILD_ID) break;
+#endif
     note_header = reinterpret_cast<const Nhdr*>(
         reinterpret_cast<const char*>(note_header) + sizeof(Nhdr) +
         NOTE_PADDING(note_header->n_namesz) +
-------------- next part --------------
--- tools/profiler/lul/LulElf.cpp.orig	2020-06-25 03:52:08 UTC
+++ tools/profiler/lul/LulElf.cpp
@@ -773,7 +773,9 @@ static bool ElfClassBuildIDNoteIdentifie
   const void* section_end = reinterpret_cast<const char*>(section) + length;
   const Nhdr* note_header = reinterpret_cast<const Nhdr*>(section);
   while (reinterpret_cast<const void*>(note_header) < section_end) {
+#ifdef NT_GNU_BUILD_ID
     if (note_header->n_type == NT_GNU_BUILD_ID) break;
+#endif
     note_header = reinterpret_cast<const Nhdr*>(
         reinterpret_cast<const char*>(note_header) + sizeof(Nhdr) +
         NOTE_PADDING(note_header->n_namesz) +