diff options
| -rw-r--r-- | build/pkg.build | 17 | ||||
| -rw-r--r-- | etc/build.usage | 3 | ||||
| -rw-r--r-- | patches/weechat-1.6_pre.local.patch | 11 |
3 files changed, 29 insertions, 2 deletions
diff --git a/build/pkg.build b/build/pkg.build index bcc6c20b..d87fdab8 100644 --- a/build/pkg.build +++ b/build/pkg.build @@ -55,7 +55,22 @@ if ! is_build_script_done build_dir; then [ "${PKG_SUBDIR}" != "${PKG_BUILD_DIR}" ] &&\ secure_rm ${PKG_BUILD_DIR}; insecure_mkdir ${PKG_BUILD_DIR}; - set_build_script_done build_dir -patch; + set_build_script_done build_dir -patch_pre; +fi; +if ! is_build_script_done patch_pre; then + for __ in \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}_pre.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}_pre.local@${BUILD_HNAME}.patch \ + ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}_pre.local.patch \ + ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}_pre.local@${BUILD_HNAME}.patch; do + if [ -r "${__}" ]; then + patch -b -d ${PKG_SUBDIR} -p1 < ${__}; + fi; + done; unset __; + if test_cmd pkg_${PKG_NAME}_patch_pre_post; then + pkg_${PKG_NAME}_patch_pre_post; + fi; + set_build_script_done patch_pre -autoconf; fi; if [ -e ${PKG_SUBDIR}/configure -o \ -e ${PKG_SUBDIR}/configure.ac -o \ diff --git a/etc/build.usage b/etc/build.usage index 9fd45407..30253679 100644 --- a/etc/build.usage +++ b/etc/build.usage @@ -12,7 +12,8 @@ usage: ./build.sh [-x] [-a nt32|nt64] [-b debug|release] [-c] [-C] [-h] -N Offline mode: no {wget,git-{clone,pull}}(1) calls. -r package[,...][:step] Restart the specified comma-separated build(s) completely or at the optionally specified step. Currently defined steps are: - fetch extract build_dir autoconf patch configure clean build install + fetch extract build_dir patch_pre autoconf patch configure clean + build install. -t[.gz|.bz2|.xz] Produce binary distribution and source tarballs containing ${PREFIX} sans ${WORKDIR} and ${PREFIX}/src/midipix_build and ${WORKDIR} sans top- level regular files at the end of a build with zero failures. The diff --git a/patches/weechat-1.6_pre.local.patch b/patches/weechat-1.6_pre.local.patch new file mode 100644 index 00000000..53b07365 --- /dev/null +++ b/patches/weechat-1.6_pre.local.patch @@ -0,0 +1,11 @@ +--- weechat-1.6/autogen.sh.orig 2016-10-02 09:35:04.000000000 +0200 ++++ weechat-1.6/autogen.sh 2016-12-07 21:16:43.722726800 +0100 +@@ -64,7 +64,7 @@ + run "rm -rf intl" + + # execute autoreconf cmds +-run "autoreconf -fvi" ++run "autoreconf -vi" + + # ending + rm -f $AUTOGEN_LOG |