Use --merge

Frenzie · Apr 19, 2019 · 93abe3e · 93abe3e
1 parent 8b459c1
commit 93abe3e
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 31 deletions.
diff --git a/thirdparty/czmq/CMakeLists.txt b/thirdparty/czmq/CMakeLists.txt
@@ -34,9 +34,9 @@ set(SED_CMD1 sh -c "${ISED} 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_fla
 set(SED_CMD2 sh -c "${ISED} 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool")
 
 # patch: ignore limited broadcast address
-set(PATCH_CMD1 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/zbeacon.patch")
+set(PATCH_CMD1 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/zbeacon.patch")
 # patch: add _DEFAULT_SOURCE define for glibc starting at version 2.20
-set(PATCH_CMD2 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/czmq_default_source_define.patch")
+set(PATCH_CMD2 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/czmq_default_source_define.patch")
 
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME

diff --git a/thirdparty/djvulibre/CMakeLists.txt b/thirdparty/djvulibre/CMakeLists.txt
@@ -38,7 +38,7 @@ set(PATCH_CMD sh -c "${ISED} \"s|-lstdc++||g\" libtool")
 if($ENV{ANDROID})
     set(PATCH_CMD "${PATCH_CMD} && ${ISED} \"s|DIST_SUBDIRS = libdjvu.*|DIST_SUBDIRS = libdjvu|g\" Makefile")
     set(PATCH_CMD "${PATCH_CMD} && ${ISED} \"s|SUBDIRS = libdjvu tools share \\$(am__append_1) \\$(am__append_2)|SUBDIRS = libdjvu share \\$(am__append_1) \\$(am__append_2)|g\" Makefile")
-    set(PATCH_CMD "${PATCH_CMD} && patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/android.patch")
+    set(PATCH_CMD "${PATCH_CMD} && patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/android.patch")
 endif()
 
 ko_write_gitclone_script(

diff --git a/thirdparty/dropbear/CMakeLists.txt b/thirdparty/dropbear/CMakeLists.txt
@@ -15,19 +15,19 @@ assert_var_defined(CHOST)
 
 ep_get_source_dir(SOURCE_DIR)
 
-set(PATCH_CMD1 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-nopasswd-hack.patch")
-set(PATCH_CMD2 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-pubkey-hack.patch")
-set(PATCH_CMD3 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-pubkey-gen-hack.patch")
-set(PATCH_CMD4 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-nochdir-hack.patch")
-set(PATCH_CMD5 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-options-hack.patch")
-set(PATCH_CMD6 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-upstream-fixes.patch")
+set(PATCH_CMD1 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-nopasswd-hack.patch")
+set(PATCH_CMD2 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-pubkey-hack.patch")
+set(PATCH_CMD3 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-pubkey-gen-hack.patch")
+set(PATCH_CMD4 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-nochdir-hack.patch")
+set(PATCH_CMD5 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-kindle-options-hack.patch")
+set(PATCH_CMD6 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-upstream-fixes.patch")
 # This is pretty much platform-specific... Hard-coded paths and all that...
 if($ENV{KOBO})
-    set(PATCH_CMD7 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-scp-command-hack-kobo.patch")
+    set(PATCH_CMD7 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-scp-command-hack-kobo.patch")
 elseif($ENV{KINDLE})
-    set(PATCH_CMD7 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-scp-command-hack-kindle.patch")
+    set(PATCH_CMD7 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-scp-command-hack-kindle.patch")
 elseif($ENV{CERVANTES})
-    set(PATCH_CMD7 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-scp-command-hack-cervantes.patch")
+    set(PATCH_CMD7 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/dropbear-2018.76-scp-command-hack-cervantes.patch")
 else()
     set(PATCH_CMD7 sh -c "true")
 endif()

diff --git a/thirdparty/glib/CMakeLists.txt b/thirdparty/glib/CMakeLists.txt
@@ -24,13 +24,13 @@ ep_get_binary_dir(BINARY_DIR)
 # sometimes just hoping there's a python binary somewhere in $PATH (which, granted, there should be)...
 # Enforce that to python3 for containers where that's the only available Python version.
 if(($ENV{APPIMAGE}) OR ($ENV{CERVANTES}) OR ($ENV{KINDLE}) OR ($ENV{KOBO}))
-    set(PATCH_CMD1 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/glib-2.56.2-python3.patch")
+    set(PATCH_CMD1 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/glib-2.56.2-python3.patch")
 else()
     set(PATCH_CMD1 sh -c "true")
 endif()
 # Android makes Linux syscalls hard to get to... Fix pilfered from Python.
 if($ENV{ANDROID})
-    set(PATCH_CMD2 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/glib-2.58.2-android-linux-syscalls.patch")
+    set(PATCH_CMD2 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/glib-2.58.2-android-linux-syscalls.patch")
 else()
     set(PATCH_CMD2 sh -c "true")
 endif()

diff --git a/thirdparty/lua-serialize/CMakeLists.txt b/thirdparty/lua-serialize/CMakeLists.txt
@@ -12,7 +12,7 @@ assert_var_defined(OUTPUT_DIR)
 
 ep_get_source_dir(SOURCE_DIR)
 
-set(PATCH_CMD sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/lua-serialize-lto.patch")
+set(PATCH_CMD sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/lua-serialize-lto.patch")
 
 set(BUILD_CMD sh -c "${KO_MAKE_RECURSIVE} -j1 CC=\"${CC}\" LDFLAGS=\"${LDFLAGS}\" OUTPUT_DIR=\"${OUTPUT_DIR}\"")
 

diff --git a/thirdparty/luajit/CMakeLists.txt b/thirdparty/luajit/CMakeLists.txt
@@ -69,7 +69,7 @@ endif()
 
 set(BUILD_CMD sh -c "${BUILD_CMD_STR}")
 
-set(PATCH_CMD sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/koreader-luajit-makefile-tweaks.patch")
+set(PATCH_CMD sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/koreader-luajit-makefile-tweaks.patch")
 
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME

diff --git a/thirdparty/mupdf/CMakeLists.txt b/thirdparty/mupdf/CMakeLists.txt
@@ -66,17 +66,17 @@ endif()
 
 set(SHARED_BUILD_CMD sh -c "${SHARED_BUILD_STR}")
 # use external fonts
-set(PATCH_CMD1 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/external_fonts.patch")
+set(PATCH_CMD1 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/external_fonts.patch")
 # add support for encryted zips
-set(PATCH_CMD2 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/encrypted_zip.patch")
+set(PATCH_CMD2 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/encrypted_zip.patch")
 # use libjpeg as a shared library
-set(PATCH_CMD3 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg_shared.patch")
+set(PATCH_CMD3 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg_shared.patch")
 # Disable potentially crashy ARM ASM (it's 7 years old, and hell to debug)
 # NOTE: There's also a few ARCH_UNALIGNED_OK checks, but we never did pass that define.
 #       (FWIW, we *could*, on anything not kindle-legacy).
-set(PATCH_CMD4 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/no_arm_asm.patch")
+set(PATCH_CMD4 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/no_arm_asm.patch")
 # Honor CFLAGS
-set(PATCH_CMD5 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/honor_cflags.patch")
+set(PATCH_CMD5 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/honor_cflags.patch")
 
 # TODO: ignore shared git submodules built outside of mupdf by ourselves
 # https://git.ghostscript.com/mupdf.git is slow, so we use the official mirror on GitHub

diff --git a/thirdparty/openssh/CMakeLists.txt b/thirdparty/openssh/CMakeLists.txt
@@ -17,7 +17,7 @@ ep_get_source_dir(SOURCE_DIR)
 ep_get_binary_dir(BINARY_DIR)
 
 # NOTE: OpenSSH >= 7.9p1 is starting to deprecated OpenSSL < 1.1.x... -_-".
-set(PATCH_CMD1 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssh-7.9_p1-openssl-1.0.2-compat.patch")
+set(PATCH_CMD1 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/openssh-7.9_p1-openssl-1.0.2-compat.patch")
 set(PATCH_CMD2 sh -c "autoreconf -fi")
 
 set(CFG_ENV_VAR "CC=\"${CC}\" CPPFLAGS=\"${CPPFLAGS} -I${SOURCE_DIR}\" CFLAGS=\"${CFLAGS}\" LIBS=\"${LIBS}\" LDFLAGS=\"${LDFLAGS}\"")

diff --git a/thirdparty/openssl/CMakeLists.txt b/thirdparty/openssl/CMakeLists.txt
@@ -58,12 +58,12 @@ else()
     set(ASM_OPT "no-asm")
 endif()
 
-set(PATCH_CMD1 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.0j-parallel_install_fix.patch")
-set(PATCH_CMD2 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.1b-CVE-2019-1543.patch")
-set(PATCH_CMD3 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-origin-rpath.patch")
+set(PATCH_CMD1 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.0j-parallel_install_fix.patch")
+set(PATCH_CMD2 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.1b-CVE-2019-1543.patch")
+set(PATCH_CMD3 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-origin-rpath.patch")
 # GCC 4.9's <stdatomic.h> is broken (c.f., https://github.com/pytorch/pytorch/issues/3050)
 if(DEFINED ENV{SONY_PRSTUX} OR DEFINED ENV{ANDROID})
-    set(PATCH_CMD4 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-gcc-4.9-stdatomic.patch")
+    set(PATCH_CMD4 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-gcc-4.9-stdatomic.patch")
 else()
     set(PATCH_CMD4 "")
 endif()

diff --git a/thirdparty/sdcv/CMakeLists.txt b/thirdparty/sdcv/CMakeLists.txt
@@ -65,7 +65,7 @@ set(ENABLE_NLS False CACHE BOOL "")
 set(WITH_READLINE False CACHE BOOL "")
 
 # Force utf8 command line parsing, and accept not-found -u dictnames
-set(PATCH_CMD patch -N -p1 -i "${CMAKE_CURRENT_SOURCE_DIR}/sdcv.patch")
+set(PATCH_CMD patch -N -p1 -i --merge "${CMAKE_CURRENT_SOURCE_DIR}/sdcv.patch")
 
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME

diff --git a/thirdparty/tar/CMakeLists.txt b/thirdparty/tar/CMakeLists.txt
@@ -16,7 +16,7 @@ ep_get_binary_dir(BINARY_DIR)
 
 # The wordsplit changes introduced in 1.31 require glob.h, which is not present on Androdi before ABI 28 (c.f., #787)
 if(DEFINED ENV{ANDROID})
-    set(PATCH_CMD1 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/tar-1.31-revert-wordsplit-for-android-glob.patch")
+    set(PATCH_CMD1 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/tar-1.31-revert-wordsplit-for-android-glob.patch")
 else()
     set(PATCH_CMD1 sh -c "true")
 endif()

diff --git a/thirdparty/zsync/CMakeLists.txt b/thirdparty/zsync/CMakeLists.txt
@@ -21,11 +21,11 @@ set(CFG_OPTS "-q --prefix=${BINARY_DIR} --host=\"${HOST}\"")
 set(CFG_CMD sh -c "CC=\"${CC}\" CFLAGS=\"${CFLAGS} -I${SOURCE_DIR}/c\" LDFLAGS=\"${LDFLAGS}\" LIBS=\"${LIBS}\" ${SOURCE_DIR}/c/configure ${CFG_OPTS}")
 # Pickup some build fixes from https://github.com/ahmedammar/zsync
 # Plus, abort if we hit an OpenStack container to avoid infinite loops
-set(PATCH_CMD1 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/zsync-openstack-abort.patch")
+set(PATCH_CMD1 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/zsync-openstack-abort.patch")
 # don't check missing definition of in_port_t in NDK <netinet/in.h>
-set(PATCH_CMD2 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/zsync-android-build-p1.patch")
+set(PATCH_CMD2 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/zsync-android-build-p1.patch")
 # fix "rename: Invalid cross-device link" error for Android
-set(PATCH_CMD3 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/zsync-android-build-p2.patch")
+set(PATCH_CMD3 sh -c "patch -N -p1 --merge < ${CMAKE_CURRENT_SOURCE_DIR}/zsync-android-build-p2.patch")
 
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME