diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-06-24 13:08:30 +0200 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-06-24 13:08:30 +0200 |
| commit | d1fb57b3de7e22bdf05808df9d86473e712c4709 (patch) | |
| tree | 61ab28cdf70064006201eaa1dc36ac045431c9f0 | |
| parent | cb0470e40d4d12330973cfad4150cbef8076edd1 (diff) | |
| download | midipix_build-d1fb57b3de7e22bdf05808df9d86473e712c4709.tar.bz2 midipix_build-d1fb57b3de7e22bdf05808df9d86473e712c4709.tar.xz | |
tmux-2.2: quick hack to force -g2 -O0 and skip st_uid checks for sockets.
| -rw-r--r-- | build.vars | 1 | ||||
| -rw-r--r-- | tmux-2.2.local.patch | 51 |
2 files changed, 51 insertions, 1 deletions
@@ -359,7 +359,6 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_TMUX_VERSION:=2.2}; : ${PKG_TMUX_SHA256SUM:=bc28541b64f99929fe8e3ae7a02291263f3c97730781201824c0f05d7c8e19e4}; : ${PKG_TMUX_URL:=https://github.com/tmux/tmux/releases/download/${PKG_TMUX_VERSION}/tmux-${PKG_TMUX_VERSION}.tar.gz}; -: ${PKG_TMUX_CFLAGS_BUILD_EXTRA:=-D_GNU_SOURCE}; : ${PKG_TMATE_VERSION:=2.2.1}; : ${PKG_TMATE_SHA256SUM:=d9c2ac59f42e65aac5f500f0548ea8056fd79c9c5285e5af324d833e2a84c305}; : ${PKG_TMATE_URL:=https://github.com/tmate-io/tmate/archive/${PKG_TMATE_VERSION}.tar.gz}; diff --git a/tmux-2.2.local.patch b/tmux-2.2.local.patch index 36e2c783..03fe4e7c 100644 --- a/tmux-2.2.local.patch +++ b/tmux-2.2.local.patch @@ -20,3 +20,54 @@ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ +--- 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); |