diff --git a/recipes/xz/01-no-poll.patch b/recipes/xz/01-no-poll.patch deleted file mode 100644 index 3c36484fec4a58f46555a09484d8088eb55d1638..0000000000000000000000000000000000000000 --- a/recipes/xz/01-no-poll.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ru source/src/xz/file_io.c source-new/src/xz/file_io.c ---- source/src/xz/file_io.c 2016-12-30 03:13:57.000000000 -0800 -+++ source-new/src/xz/file_io.c 2017-08-08 12:34:08.453700076 -0700 -@@ -17,7 +17,7 @@ - #ifdef TUKLIB_DOSLIKE - # include - #else --# include -+//# include - static bool warn_fchown; - #endif - -@@ -222,7 +222,7 @@ - #endif // ENABLE_SANDBOX - - --#ifndef TUKLIB_DOSLIKE -+#if 0 - /// \brief Waits for input or output to become available or for a signal - /// - /// This uses the self-pipe trick to avoid a race condition that can occur -@@ -704,6 +704,7 @@ - // If it is something else than a regular file, wait until - // there is input available. This way reading from FIFOs - // will work when open() is used with O_NONBLOCK. -+#if 0 - if (!S_ISREG(pair->src_st.st_mode)) { - signals_unblock(); - const io_wait_ret ret = io_wait(pair, -1, true); -@@ -713,6 +714,7 @@ - goto error; - } - #endif -+#endif - - #ifdef HAVE_POSIX_FADVISE - // It will fail with some special files like FIFOs but that is fine. -@@ -1127,7 +1129,7 @@ - continue; - } - --#ifndef TUKLIB_DOSLIKE -+#if 0 - if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) { - const io_wait_ret ret = io_wait(pair, - mytime_get_flush_timeout(), -@@ -1215,7 +1217,7 @@ - continue; - } - --#ifndef TUKLIB_DOSLIKE -+#if 0 - if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) { - if (io_wait(pair, -1, false) == IO_WAIT_MORE) - continue; diff --git a/recipes/xz/02-o_noctty.patch b/recipes/xz/02-o_noctty.patch deleted file mode 100644 index 2ad56398fde29b6c775466b17dc529b57d3958ec..0000000000000000000000000000000000000000 --- a/recipes/xz/02-o_noctty.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru source/src/common/tuklib_open_stdxxx.c source-new/src/common/tuklib_open_stdxxx.c ---- source/src/common/tuklib_open_stdxxx.c 2016-12-30 03:08:20.000000000 -0800 -+++ source-new/src/common/tuklib_open_stdxxx.c 2017-08-08 12:38:10.703829409 -0700 -@@ -35,8 +35,8 @@ - // writing to stdin would fail. However, /dev/full - // is Linux specific, and if the program tries to - // write to stdin, there's already a problem anyway. -- const int fd = open("/dev/null", O_NOCTTY -- | (i == 0 ? O_WRONLY : O_RDONLY)); -+ const int fd = open("/dev/null", -+ (i == 0 ? O_WRONLY : O_RDONLY)); - - if (fd != i) { - if (fd != -1) diff --git a/recipes/xz/03-no-signals.patch b/recipes/xz/03-no-signals.patch deleted file mode 100644 index 5fce80eaa49edc5d38e51a9eafaeb6f329c0200c..0000000000000000000000000000000000000000 --- a/recipes/xz/03-no-signals.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ru source/src/xz/message.c source-new/src/xz/message.c ---- source/src/xz/message.c 2016-12-30 03:08:20.000000000 -0800 -+++ source-new/src/xz/message.c 2017-08-08 12:44:30.584447139 -0700 -@@ -135,7 +135,7 @@ - } - */ - --#ifdef SIGALRM -+#if 0 - // Establish the signal handlers which set a flag to tell us that - // progress info should be updated. - struct sigaction sa; -diff -ru source/src/xz/signals.c source-new/src/xz/signals.c ---- source/src/xz/signals.c 2016-12-30 03:08:20.000000000 -0800 -+++ source-new/src/xz/signals.c 2017-08-08 12:41:59.624111395 -0700 -@@ -53,6 +53,7 @@ - extern void - signals_init(void) - { -+#if 0 - // List of signals for which we establish the signal handler. - static const int sigs[] = { - SIGINT, -@@ -112,6 +113,7 @@ - signals_are_initialized = true; - - return; -+#endif - } - - -@@ -152,6 +154,7 @@ - extern void - signals_exit(void) - { -+#if 0 - const int sig = exit_signal; - - if (sig != 0) { -@@ -171,6 +174,7 @@ - } - - return; -+#endif - } - - #else diff --git a/recipes/xz/recipe.sh b/recipes/xz/recipe.sh deleted file mode 100644 index 239add3561a54ada71ed793904fd06bfd06a3945..0000000000000000000000000000000000000000 --- a/recipes/xz/recipe.sh +++ /dev/null @@ -1,60 +0,0 @@ -VERSION=5.2.3 -TAR=https://codeload.github.com/xz-mirror/xz/tar.gz/v$VERSION - -function recipe_version { - echo "$VERSION" - skip=1 -} - -function recipe_update { - echo "skipping update" - skip=1 -} - -function recipe_build { - export CFLAGS="-static" - - # autogen.sh requires autopoint which is provided by the gettext homebrew - # formula on macOS. Unfortunately, homebrew does not install it into PATH - # because macOS provides the BSD gettext library. So we make sure to include - # it in PATH, preceding the default BSD version. - if [[ "$(uname)" == "Darwin" ]]; then - export PATH="/usr/local/opt/gettext/bin:$PATH" - fi - - ./autogen.sh - - chmod +w build-aux/config.sub - wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub - ./configure \ - --build=${BUILD} \ - --host=${HOST} \ - --prefix=/ \ - --disable-lzmadec \ - --disable-lzmainfo \ - --disable-xz \ - --disable-xzdec \ - --enable-shared=no \ - --enable-static=yes \ - --enable-threads=no \ - --with-pic=no - "$REDOX_MAKE" -j"$($NPROC)" - skip=1 -} - -function recipe_test { - echo "skipping test" - skip=1 -} - -function recipe_clean { - "$REDOX_MAKE" clean - skip=1 -} - -function recipe_stage { - dest="$(realpath $1)" - "$REDOX_MAKE" DESTDIR="$dest" install - rm -rf "$dest/share" - skip=1 -}