diff options
Diffstat (limited to 'community/drawterm/respect-env.patch')
| -rw-r--r-- | community/drawterm/respect-env.patch | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/community/drawterm/respect-env.patch b/community/drawterm/respect-env.patch index 7bf5db68107..c383ed7b01b 100644 --- a/community/drawterm/respect-env.patch +++ b/community/drawterm/respect-env.patch @@ -1,22 +1,25 @@ -diff -upr drawterm-20170119.orig/Make.unix drawterm-20170119/Make.unix ---- drawterm-20170119.orig/Make.unix 2017-01-23 22:41:27.402630694 +0100 -+++ drawterm-20170119/Make.unix 2017-01-23 22:41:43.879309573 +0100 -@@ -5,12 +5,15 @@ AR=ar +Make sure common environment variables (CC, CFLAGS, LDFLAGS, …) are not +overwritten. Also allow configuring the X11 library and include +directory separately. + +diff -upr drawterm-0_git20240320.orig/Make.unix drawterm-0_git20240320/Make.unix +--- drawterm-0_git20240320.orig/Make.unix 2024-03-20 18:10:01.746844469 +0100 ++++ drawterm-0_git20240320/Make.unix 2024-03-20 18:11:00.280317013 +0100 +@@ -5,13 +5,14 @@ AR=ar AS=as RANLIB=ranlib X11=/usr/X11R6 -CC=gcc --CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2 -+X11INC=$(X11)/include -+X11LIB=$(X11)/lib +-CFLAGS=-Wall -Wno-missing-braces -Wno-parentheses -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2 +CC?=gcc +CFLAGS?=-O2 -+CFLAGS+=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11INC) -D_THREAD_SAFE $(PTHREAD) ++CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) O=o OS=posix GUI=x11 --LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb -+LDADD=-L$(X11LIB) -lX11 -ggdb - LDFLAGS=$(PTHREAD) + LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb -lm +-LDFLAGS=$(PTHREAD) ++LDFLAGS+=$(PTHREAD) TARG=drawterm # AUDIO=none + AUDIO=unix |