diff options
author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-11-14 23:02:47 +0100 |
---|---|---|
committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-11-15 20:40:50 +0100 |
commit | 59765f508225998d8a73b1da8380ff06b4a6b79c (patch) | |
tree | 9397850a4ab5bac51ec373558722c45be4fe7258 /patches/tmux-2.2.local.patch | |
parent | 8739dbe67d82f90d1c3b63a8d07af291c4ace600 (diff) | |
download | midipix_build-59765f508225998d8a73b1da8380ff06b4a6b79c.tar.bz2 midipix_build-59765f508225998d8a73b1da8380ff06b4a6b79c.tar.xz |
1) Replaces the SysV-style build script link mechanism w/ build {,meta-}targets,
2) splits build.{subr,sh}} into subr/{build,pkg,rtl}.subr and build.sh,
3) replaces {997.strip,998.midipix_sh,999.tarballs}.build with subr/{strip,tarball}.subr,
4) moves patches to patches/, vars files to vars/, and everything else to etc/,
5) renames `Create `Midipix mintty shell' shortcut.vbs' to midipix_shortcut.vbs,
6) fixes a Weechat configure issue, and
7) updates etc/{build.usage,README}.
Diffstat (limited to 'patches/tmux-2.2.local.patch')
-rw-r--r-- | patches/tmux-2.2.local.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/patches/tmux-2.2.local.patch b/patches/tmux-2.2.local.patch new file mode 100644 index 00000000..3fdec0a7 --- /dev/null +++ b/patches/tmux-2.2.local.patch @@ -0,0 +1,51 @@ +--- tmux-2.2/configure.orig 2016-04-11 02:01:19.000000000 +0200 ++++ tmux-2.2/configure 2016-06-24 12:56:52.685289900 +0200 +@@ -3664,18 +3664,6 @@ + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +--- tmux-2.2/Makefile.in.orig 2016-04-11 02:01:16.000000000 +0200 ++++ tmux-2.2/Makefile.in 2016-06-24 12:58:45.526157800 +0200 +@@ -94,10 +94,10 @@ + + # glibc as usual does things ass-backwards and hides useful things by default, + # so everyone has to add this. +-@IS_GLIBC_TRUE@am__append_1 = -D_GNU_SOURCE ++am__append_1 = -D_GNU_SOURCE + + # Set flags for gcc. +-@IS_GCC_TRUE@am__append_2 = -std=gnu99 -O2 ++@IS_GCC_TRUE@am__append_2 = -std=gnu99 + @IS_DEBUG_TRUE@@IS_GCC_TRUE@am__append_3 = -g -Wno-long-long -Wall -W \ + @IS_DEBUG_TRUE@@IS_GCC_TRUE@ -Wnested-externs -Wformat=2 \ + @IS_DEBUG_TRUE@@IS_GCC_TRUE@ -Wmissing-prototypes \ +--- tmux-2.2/tmux.c.orig 2016-03-05 18:55:49.000000000 +0100 ++++ tmux-2.2/tmux.c 2016-06-24 13:00:39.079504000 +0200 +@@ -133,10 +133,12 @@ + errno = ENOTDIR; + goto fail; + } ++#if 0 + if (sb.st_uid != uid || (sb.st_mode & S_IRWXO) != 0) { + errno = EACCES; + goto fail; + } ++#endif + + if (realpath(base, resolved) == NULL) + strlcpy(resolved, base, sizeof resolved); |