Update components for distro 14.1.

boost.sh: Amazingly, Boost 1.62.0 fixed #3. However, the newly-added Boost.Fiber needs to be disabled because it's attempting to use std::mutex (#28). Also, Boost.Python still needs to be disabled (#29). coreutils.patch: Regenerate and work around strerror_r()'s absence. freetype.sh: --without-png isn't necessary anymore. gdb.sh: Fix #27. glm.sh: The zip now contains a versioned directory. libjpeg-turbo.sh: cmake isn't supported anymore. -Wno-attributes isn't necessary anymore. mpfr.patch: mpfr 3.1.5 doesn't have upstream patches yet. sdl+libogg+libvorbis+sdl_mixer+vorbis-tools.sh: --disable-render-d3d isn't necessary anymore, fixing #10. glbinding.patch, sdl-clipcursor.patch: Regenerate.
StephanTLavavej · Dec 12, 2016 · b97f05a · b97f05a
1 parent e13b9ce
commit b97f05a
Show file tree

Hide file tree

Showing 18 changed files with 174 additions and 294 deletions.
diff --git a/binutils.sh b/binutils.sh
@@ -2,10 +2,10 @@
 
 source ./0_append_distro_path.sh
 
-extract_file binutils-2.26.tar
+extract_file binutils-2.27.tar
 
 cd /c/temp/gcc
-mv binutils-2.26 src
+mv binutils-2.27 src
 mkdir build dest
 cd build
 
@@ -17,8 +17,8 @@ make $X_MAKE_JOBS all "CFLAGS=-O3" "LDFLAGS=-s" || fail_with binutils 2 - EPIC F
 make install || fail_with binutils 3 - EPIC FAIL
 cd /c/temp/gcc
 rm -rf build src
-mv dest binutils-2.26
-cd binutils-2.26
+mv dest binutils-2.27
+cd binutils-2.27
 rm -rf lib/*.la share
 
-7z -mx0 a ../binutils-2.26.7z *
+7z -mx0 a ../binutils-2.27.7z *
diff --git a/boost.sh b/boost.sh
@@ -2,20 +2,18 @@
 
 source ./0_append_distro_path.sh
 
-extract_file boost_1_61_0.tar
+extract_file boost_1_62_0.tar
 
 cd /c/temp/gcc
-mv boost_1_61_0 src
+mv boost_1_62_0 src
 mkdir -p dest/include
 cd src
 ./bootstrap.sh || fail_with boost 1 - EPIC FAIL
 
-# --without-context : https://svn.boost.org/trac/boost/ticket/7262
-# --without-coroutine : Boost.Coroutine depends on Boost.Context.
-# --without-coroutine2 : Ditto.
-# --without-python : I don't have Python, but that isn't being correctly detected anymore.
+# --without-fiber : This attempts to use std::mutex. (12/3/2016)
+# --without-python : I don't have Python, but that isn't being correctly detected anymore. (12/3/2016)
 
-./b2 $X_B2_JOBS --without-context --without-coroutine --without-coroutine2 --without-python \
+./b2 $X_B2_JOBS --without-fiber --without-python \
 variant=release link=static runtime-link=static threading=multi --stagedir=/c/temp/gcc/dest stage \
 -sNO_BZIP2 -sBZIP2_BINARY=bz2 -sBZIP2_INCLUDE=$X_DISTRO_INC -sBZIP2_LIBPATH=$X_DISTRO_LIB \
 -sNO_ZLIB -sZLIB_BINARY=z -sZLIB_INCLUDE=$X_DISTRO_INC -sZLIB_LIBPATH=$X_DISTRO_LIB || fail_with boost 2 - EPIC FAIL
@@ -24,10 +22,10 @@ cd /c/temp/gcc/dest/lib
 for i in *.a; do mv $i ${i%-mgw*.a}.a; done
 cd /c/temp/gcc
 mv src/boost dest/include
-mv dest boost-1.61.0
+mv dest boost-1.62.0
 
-cd boost-1.61.0
-7z -mx0 a ../boost-1.61.0.7z * || fail_with boost-1.61.0.7z - EPIC FAIL
+cd boost-1.62.0
+7z -mx0 a ../boost-1.62.0.7z * || fail_with boost-1.62.0.7z - EPIC FAIL
 
 cd /c/temp/gcc
 rm -rf src
diff --git a/coreutils.patch b/coreutils.patch
@@ -1,7 +1,7 @@
-diff -aurN coreutils-8.25/configure coreutils-8.25-fixed/configure
---- coreutils-8.25/configure	2016-01-20 02:32:53.000000000 -0800
-+++ coreutils-8.25-fixed/configure	2016-04-07 21:46:33.632386300 -0700
-@@ -40685,17 +40685,7 @@
+diff -aurN coreutils-8.26/configure coreutils-8.26-fixed/configure
+--- coreutils-8.26/configure	2016-11-30 10:12:35.000000000 -0800
++++ coreutils-8.26-fixed/configure	2016-12-04 13:05:27.857065100 -0800
+@@ -41220,17 +41220,7 @@
    esac
  fi
 
@@ -19,9 +19,9 @@ diff -aurN coreutils-8.25/configure coreutils-8.25-fixed/configure
 
 
 
-diff -aurN coreutils-8.25/lib/c-strtod.c coreutils-8.25-fixed/lib/c-strtod.c
---- coreutils-8.25/lib/c-strtod.c	2016-01-01 05:45:55.000000000 -0800
-+++ coreutils-8.25-fixed/lib/c-strtod.c	2016-04-07 21:46:33.648011100 -0700
+diff -aurN coreutils-8.26/lib/c-strtod.c coreutils-8.26-fixed/lib/c-strtod.c
+--- coreutils-8.26/lib/c-strtod.c	2016-07-15 12:47:39.000000000 -0700
++++ coreutils-8.26-fixed/lib/c-strtod.c	2016-12-04 13:05:27.872689700 -0800
 @@ -26,7 +26,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -40,16 +40,39 @@ diff -aurN coreutils-8.25/lib/c-strtod.c coreutils-8.25-fixed/lib/c-strtod.c
  # define STRTOD strtold
  #else
  # define STRTOD strtod
-diff -aurN coreutils-8.25/lib/c-strtold.c coreutils-8.25-fixed/lib/c-strtold.c
---- coreutils-8.25/lib/c-strtold.c	2011-08-23 06:48:12.000000000 -0700
-+++ coreutils-8.25-fixed/lib/c-strtold.c	2016-04-07 21:46:33.663635900 -0700
+diff -aurN coreutils-8.26/lib/c-strtold.c coreutils-8.26-fixed/lib/c-strtold.c
+--- coreutils-8.26/lib/c-strtold.c	2011-08-23 06:48:12.000000000 -0700
++++ coreutils-8.26-fixed/lib/c-strtold.c	2016-12-04 13:05:27.872689700 -0800
 @@ -1,2 +1,2 @@
 -#define LONG 1
 +#define LONGCAT 1
  #include "c-strtod.c"
-diff -aurN coreutils-8.25/lib/ftruncate.c coreutils-8.25-fixed/lib/ftruncate.c
---- coreutils-8.25/lib/ftruncate.c	2016-01-01 05:45:55.000000000 -0800
-+++ coreutils-8.25-fixed/lib/ftruncate.c	2016-04-07 21:46:33.663635900 -0700
+diff -aurN coreutils-8.26/lib/error.c coreutils-8.26-fixed/lib/error.c
+--- coreutils-8.26/lib/error.c	2016-11-05 10:10:04.000000000 -0700
++++ coreutils-8.26-fixed/lib/error.c	2016-12-04 13:03:33.051704800 -0800
+@@ -172,19 +172,7 @@
+ {
+   char const *s;
+
+-#if defined HAVE_STRERROR_R || _LIBC
+-  char errbuf[1024];
+-# if _LIBC || STRERROR_R_CHAR_P
+-  s = __strerror_r (errnum, errbuf, sizeof errbuf);
+-# else
+-  if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
+-    s = errbuf;
+-  else
+-    s = 0;
+-# endif
+-#else
+   s = strerror (errnum);
+-#endif
+
+ #if !_LIBC
+   if (! s)
+diff -aurN coreutils-8.26/lib/ftruncate.c coreutils-8.26-fixed/lib/ftruncate.c
+--- coreutils-8.26/lib/ftruncate.c	2016-07-15 12:47:39.000000000 -0700
++++ coreutils-8.26-fixed/lib/ftruncate.c	2016-12-04 13:05:27.888315100 -0800
 @@ -14,6 +14,10 @@
     You should have received a copy of the GNU General Public License along
     with this program; if not, see <http://www.gnu.org/licenses/>.  */
@@ -72,9 +95,9 @@ diff -aurN coreutils-8.25/lib/ftruncate.c coreutils-8.25-fixed/lib/ftruncate.c
  /* Get declarations of the native Windows API functions.  */
  #  define WIN32_LEAN_AND_MEAN
  #  include <windows.h>
-diff -aurN coreutils-8.25/lib/gethostname.c coreutils-8.25-fixed/lib/gethostname.c
---- coreutils-8.25/lib/gethostname.c	2016-01-01 05:45:55.000000000 -0800
-+++ coreutils-8.25-fixed/lib/gethostname.c	2016-04-07 21:46:33.679254200 -0700
+diff -aurN coreutils-8.26/lib/gethostname.c coreutils-8.26-fixed/lib/gethostname.c
+--- coreutils-8.26/lib/gethostname.c	2016-07-15 12:47:39.000000000 -0700
++++ coreutils-8.26-fixed/lib/gethostname.c	2016-12-04 13:05:27.888315100 -0800
 @@ -87,8 +87,9 @@
  #undef gethostname
 
@@ -86,9 +109,9 @@ diff -aurN coreutils-8.25/lib/gethostname.c coreutils-8.25-fixed/lib/gethostname
    int r;
 
    if (len > INT_MAX)
-diff -aurN coreutils-8.25/lib/randread.c coreutils-8.25-fixed/lib/randread.c
---- coreutils-8.25/lib/randread.c	2016-01-01 05:48:50.000000000 -0800
-+++ coreutils-8.25-fixed/lib/randread.c	2016-04-07 21:46:33.679254200 -0700
+diff -aurN coreutils-8.26/lib/randread.c coreutils-8.26-fixed/lib/randread.c
+--- coreutils-8.26/lib/randread.c	2016-11-26 16:28:45.000000000 -0800
++++ coreutils-8.26-fixed/lib/randread.c	2016-12-04 13:05:27.888315100 -0800
 @@ -176,9 +176,6 @@
      }
    ISAAC_SEED (struct timeval, gettimeofday (&v, NULL));
@@ -99,9 +122,9 @@ diff -aurN coreutils-8.25/lib/randread.c coreutils-8.25-fixed/lib/randread.c
 
  #ifdef lint
    /* Normally we like having the extra randomness from uninitialized
-diff -aurN coreutils-8.25/lib/unistd.in.h coreutils-8.25-fixed/lib/unistd.in.h
---- coreutils-8.25/lib/unistd.in.h	2016-01-01 06:17:01.000000000 -0800
-+++ coreutils-8.25-fixed/lib/unistd.in.h	2016-04-07 21:46:33.679254200 -0700
+diff -aurN coreutils-8.26/lib/unistd.in.h coreutils-8.26-fixed/lib/unistd.in.h
+--- coreutils-8.26/lib/unistd.in.h	2016-11-30 05:52:00.000000000 -0800
++++ coreutils-8.26-fixed/lib/unistd.in.h	2016-12-04 13:05:27.888315100 -0800
 @@ -739,9 +739,9 @@
  #   undef gethostname
  #   define gethostname rpl_gethostname
@@ -114,9 +137,9 @@ diff -aurN coreutils-8.25/lib/unistd.in.h coreutils-8.25-fixed/lib/unistd.in.h
  # else
  #  if !@HAVE_GETHOSTNAME@
  _GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
-diff -aurN coreutils-8.25/lib/xstrtod.c coreutils-8.25-fixed/lib/xstrtod.c
---- coreutils-8.25/lib/xstrtod.c	2016-01-01 05:45:55.000000000 -0800
-+++ coreutils-8.25-fixed/lib/xstrtod.c	2016-04-07 21:46:33.694879600 -0700
+diff -aurN coreutils-8.26/lib/xstrtod.c coreutils-8.26-fixed/lib/xstrtod.c
+--- coreutils-8.26/lib/xstrtod.c	2016-07-15 12:47:39.000000000 -0700
++++ coreutils-8.26-fixed/lib/xstrtod.c	2016-12-04 13:05:27.888315100 -0800
 @@ -26,7 +26,7 @@
  #include <limits.h>
  #include <stdio.h>
@@ -126,16 +149,16 @@ diff -aurN coreutils-8.25/lib/xstrtod.c coreutils-8.25-fixed/lib/xstrtod.c
  # define XSTRTOD xstrtold
  # define DOUBLE long double
  #else
-diff -aurN coreutils-8.25/lib/xstrtold.c coreutils-8.25-fixed/lib/xstrtold.c
---- coreutils-8.25/lib/xstrtold.c	2011-08-23 06:48:13.000000000 -0700
-+++ coreutils-8.25-fixed/lib/xstrtold.c	2016-04-07 21:46:33.694879600 -0700
+diff -aurN coreutils-8.26/lib/xstrtold.c coreutils-8.26-fixed/lib/xstrtold.c
+--- coreutils-8.26/lib/xstrtold.c	2011-08-23 06:48:13.000000000 -0700
++++ coreutils-8.26-fixed/lib/xstrtold.c	2016-12-04 13:05:27.903949000 -0800
 @@ -1,2 +1,2 @@
 -#define LONG 1
 +#define LONGCAT 1
  #include "xstrtod.c"
-diff -aurN coreutils-8.25/src/sort.c coreutils-8.25-fixed/src/sort.c
---- coreutils-8.25/src/sort.c	2016-01-16 11:09:33.000000000 -0800
-+++ coreutils-8.25-fixed/src/sort.c	2016-04-07 21:51:00.800143100 -0700
+diff -aurN coreutils-8.26/src/sort.c coreutils-8.26-fixed/src/sort.c
+--- coreutils-8.26/src/sort.c	2016-11-06 14:15:30.000000000 -0800
++++ coreutils-8.26-fixed/src/sort.c	2016-12-04 13:05:27.903949000 -0800
 @@ -26,7 +26,6 @@
  #include <pthread.h>
  #include <sys/resource.h>
@@ -144,7 +167,7 @@ diff -aurN coreutils-8.25/src/sort.c coreutils-8.25-fixed/src/sort.c
  #include <signal.h>
  #include <assert.h>
  #include "system.h"
-@@ -475,8 +474,6 @@
+@@ -476,8 +475,6 @@
    -c, --check, --check=diagnose-first  check for sorted input; do not sort\n\
    -C, --check=quiet, --check=silent  like -c, but do not report first bad line\
  \n\
@@ -153,37 +176,37 @@ diff -aurN coreutils-8.25/src/sort.c coreutils-8.25-fixed/src/sort.c
  "), stdout);
        fputs (_("\
        --debug               annotate the part of the line used to sort,\n\
-@@ -541,7 +538,6 @@
+@@ -542,7 +539,6 @@
  enum
  {
    CHECK_OPTION = CHAR_MAX + 1,
 -  COMPRESS_PROGRAM_OPTION,
    DEBUG_PROGRAM_OPTION,
    FILES0_FROM_OPTION,
    NMERGE_OPTION,
-@@ -556,7 +552,6 @@
+@@ -557,7 +553,6 @@
  {
    {"ignore-leading-blanks", no_argument, NULL, 'b'},
    {"check", optional_argument, NULL, CHECK_OPTION},
 -  {"compress-program", required_argument, NULL, COMPRESS_PROGRAM_OPTION},
    {"debug", no_argument, NULL, DEBUG_PROGRAM_OPTION},
    {"dictionary-order", no_argument, NULL, 'd'},
    {"ignore-case", no_argument, NULL, 'f'},
-@@ -717,21 +712,7 @@
+@@ -718,21 +713,7 @@
  static pid_t
  reap (pid_t pid)
  {
 -  int status;
 -  pid_t cpid = waitpid ((pid ? pid : -1), &status, (pid ? 0 : WNOHANG));
 -
 -  if (cpid < 0)
--    error (SORT_FAILURE, errno, _("waiting for %s [-d]"),
--           quoteaf (compress_program));
+-    die (SORT_FAILURE, errno, _("waiting for %s [-d]"),
+-         quoteaf (compress_program));
 -  else if (0 < cpid && (0 < pid || delete_proc (cpid)))
 -    {
 -      if (! WIFEXITED (status) || WEXITSTATUS (status))
--        error (SORT_FAILURE, 0, _("%s [-d] terminated abnormally"),
--               quoteaf (compress_program));
+-        die (SORT_FAILURE, 0, _("%s [-d] terminated abnormally"),
+-             quoteaf (compress_program));
 -      --nprocs;
 -    }
 -
@@ -192,16 +215,16 @@ diff -aurN coreutils-8.25/src/sort.c coreutils-8.25-fixed/src/sort.c
  }
 
  /* TEMP represents a new process; add it to the process table.  Create
-@@ -3734,7 +3715,7 @@
+@@ -3754,7 +3735,7 @@
        if (STREQ (files[i], "-"))
          continue;
 
 -      if (euidaccess (files[i], R_OK) != 0)
 +      if (access (files[i], R_OK) != 0)
-         die (_("cannot read"), files[i]);
+         sort_die (_("cannot read"), files[i]);
      }
  }
-@@ -4228,7 +4209,7 @@
+@@ -4247,7 +4228,7 @@
      static int const sig[] =
        {
          /* The usual suspects.  */
@@ -210,66 +233,66 @@ diff -aurN coreutils-8.25/src/sort.c coreutils-8.25-fixed/src/sort.c
  #ifdef SIGPOLL
          SIGPOLL,
  #endif
-@@ -4274,7 +4255,6 @@
+@@ -4293,7 +4274,6 @@
          }
  #endif
    }
 -  signal (SIGCHLD, SIG_DFL); /* Don't inherit CHLD handling from parent.  */
 
    /* The signal mask is known, so it is safe to invoke exit_cleanup.  */
    atexit (exit_cleanup);
-@@ -4399,12 +4379,6 @@
+@@ -4418,12 +4398,6 @@
            checkonly = c;
            break;
 
 -        case COMPRESS_PROGRAM_OPTION:
 -          if (compress_program && !STREQ (compress_program, optarg))
--            error (SORT_FAILURE, 0, _("multiple compress programs specified"));
+-            die (SORT_FAILURE, 0, _("multiple compress programs specified"));
 -          compress_program = optarg;
 -          break;
 -
          case DEBUG_PROGRAM_OPTION:
            debug = true;
            break;
-@@ -4758,8 +4732,8 @@
+@@ -4777,8 +4751,8 @@
      free (files);
  #endif
 
 -  if (have_read_stdin && fclose (stdin) == EOF)
--    die (_("close failed"), "-");
+-    sort_die (_("close failed"), "-");
 +  if (have_read_stdin)
 +    fclose (stdin);
 
    return EXIT_SUCCESS;
  }
-diff -aurN coreutils-8.25/src/uniq.c coreutils-8.25-fixed/src/uniq.c
---- coreutils-8.25/src/uniq.c	2016-01-13 03:08:59.000000000 -0800
-+++ coreutils-8.25-fixed/src/uniq.c	2016-04-07 21:54:06.160202300 -0700
-@@ -233,7 +233,6 @@
+diff -aurN coreutils-8.26/src/uniq.c coreutils-8.26-fixed/src/uniq.c
+--- coreutils-8.26/src/uniq.c	2016-11-06 14:15:30.000000000 -0800
++++ coreutils-8.26-fixed/src/uniq.c	2016-12-04 13:05:27.903949000 -0800
+@@ -241,7 +241,6 @@
  size_opt (char const *opt, char const *msgid)
  {
    unsigned long int size;
 -  verify (SIZE_MAX <= ULONG_MAX);
 
    switch (xstrtoul (opt, NULL, 10, &size, ""))
      {
-@@ -461,9 +460,11 @@
+@@ -469,9 +468,11 @@
      }
 
   closefiles:
 -  if (ferror (stdin) || fclose (stdin) != 0)
 +  if (ferror (stdin))
-     error (EXIT_FAILURE, 0, _("error reading %s"), quoteaf (infile));
+     die (EXIT_FAILURE, 0, _("error reading %s"), quoteaf (infile));
 
 +  fclose (stdin);
 +
    /* stdout is handled via the atexit-invoked close_stdout function.  */
 
    free (lb1.buffer);
-diff -aurN coreutils-8.25/src/wc.c coreutils-8.25-fixed/src/wc.c
---- coreutils-8.25/src/wc.c	2016-01-13 03:11:36.000000000 -0800
-+++ coreutils-8.25-fixed/src/wc.c	2016-04-07 21:46:33.710504700 -0700
-@@ -531,7 +531,7 @@
+diff -aurN coreutils-8.26/src/wc.c coreutils-8.26-fixed/src/wc.c
+--- coreutils-8.26/src/wc.c	2016-11-06 14:15:30.000000000 -0800
++++ coreutils-8.26-fixed/src/wc.c	2016-12-04 13:05:27.903949000 -0800
+@@ -532,7 +532,7 @@
      {
        have_read_stdin = true;
        if (O_BINARY && ! isatty (STDIN_FILENO))

diff --git a/coreutils.sh b/coreutils.sh
@@ -2,12 +2,12 @@
 
 source ./0_append_distro_path.sh
 
-extract_file coreutils-8.25.tar
+extract_file coreutils-8.26.tar
 
-patch -d /c/temp/gcc/coreutils-8.25 -p1 < coreutils.patch
+patch -d /c/temp/gcc/coreutils-8.26 -p1 < coreutils.patch
 
 cd /c/temp/gcc
-mv coreutils-8.25 src
+mv coreutils-8.26 src
 mkdir -p build dest/bin
 
 # Missing <sys/wait.h>.
@@ -28,7 +28,7 @@ cd src
 mv sort.exe uniq.exe wc.exe ../../dest/bin || fail_with coreutils 2 - EPIC FAIL
 cd /c/temp/gcc
 rm -rf build src
-mv dest coreutils-8.25
-cd coreutils-8.25
+mv dest coreutils-8.26
+cd coreutils-8.26
 
-7z -mx0 a ../coreutils-8.25.7z *
+7z -mx0 a ../coreutils-8.26.7z *