diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-10-22 05:55:19 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-10-22 05:55:19 +0000 |
| commit | d28af6cac66d5892e15399fc63879e9de4be2c80 (patch) | |
| tree | b751cd65da29cb738c12f8896dffa3753d2d90c2 /app-misc/twin/files | |
| parent | make sure our startup binary executes the proper e17 binary #148564 (diff) | |
| download | gentoo-2-d28af6cac66d5892e15399fc63879e9de4be2c80.tar.gz gentoo-2-d28af6cac66d5892e15399fc63879e9de4be2c80.tar.bz2 gentoo-2-d28af6cac66d5892e15399fc63879e9de4be2c80.zip | |
Cleanup build and fix compile failure with gcc4 #152133.
(Portage version: 2.1.2_pre3-r5)
Diffstat (limited to 'app-misc/twin/files')
| -rw-r--r-- | app-misc/twin/files/twin-0.4.6-build.patch | 31 | ||||
| -rw-r--r-- | app-misc/twin/files/twin-0.4.6-gcc.patch | 21 |
2 files changed, 52 insertions, 0 deletions
diff --git a/app-misc/twin/files/twin-0.4.6-build.patch b/app-misc/twin/files/twin-0.4.6-build.patch new file mode 100644 index 000000000000..fb7a8d033330 --- /dev/null +++ b/app-misc/twin/files/twin-0.4.6-build.patch @@ -0,0 +1,31 @@ +just respect the settings from portage, local strip stuff be damned + +--- makerules ++++ makerules +@@ -27,25 +27,7 @@ + # + # compile/link flags. Used if no CFLAGS/LDFLAGS given in `make' command line + # +-ifdef DEBUG +- CFLAGS+=-g -DINLINE=static +- LDFLAGS+=-g +-else +- ifdef PROFILE +- CFLAGS+=-p -pg +- LDFLAGS+=-p -pg +- else +- ifeq ($(CC),gcc) +- CFLAGS+=-O2 -fomit-frame-pointer +- LDFLAGS+=-s +- else +- # detected by `./configure' : +- CFLAGS+=$(CC_AC_FLAGS) +- endif +- # strip installed binaries +- INSTALLFLAGS+=-s +- endif +-endif ++CFLAGS+=$(CC_AC_FLAGS) + + # + # how picky should your compiler be? uncomment for paranoid gcc settings. diff --git a/app-misc/twin/files/twin-0.4.6-gcc.patch b/app-misc/twin/files/twin-0.4.6-gcc.patch index 88fa69d70a73..62fd7f62e983 100644 --- a/app-misc/twin/files/twin-0.4.6-gcc.patch +++ b/app-misc/twin/files/twin-0.4.6-gcc.patch @@ -17,3 +17,24 @@ s_tw_errno *E; byte *q; int i; +--- server/HW/hw_tty.c ++++ server/HW/hw_tty.c +@@ -389,8 +389,9 @@ + + static byte xterm_MouseData[10] = "\033[M#!!!!"; + ++static void xterm_MouseEvent(int fd, display_hw hw); ++ + static void stdin_KeyboardEvent(int fd, display_hw hw) { +- static void xterm_MouseEvent(int, display_hw); + static byte *match; + byte got, chunk, buf[SMALLBUFF], *s, *sret; + udat Code, ShiftFlags; +@@ -574,7 +575,6 @@ + */ + + static void xterm_QuitMouse(void); +-static void xterm_MouseEvent(int fd, display_hw hw); + + + /* return FALSE if failed */ |