diff options
| -rw-r--r-- | testing/drawterm/APKBUILD | 19 | ||||
| -rw-r--r-- | testing/drawterm/respect-cflags.patch | 13 | ||||
| -rw-r--r-- | testing/drawterm/respect-env.patch | 22 |
3 files changed, 35 insertions, 19 deletions
diff --git a/testing/drawterm/APKBUILD b/testing/drawterm/APKBUILD index 8c4bb49b31..985699d9e3 100644 --- a/testing/drawterm/APKBUILD +++ b/testing/drawterm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=drawterm pkgver=20170119 -pkgrel=0 +pkgrel=1 pkgdesc="Connect to Plan 9 CPU servers from other operating systems" url="http://drawterm.9front.org/" arch="all !armhf !aarch64" @@ -12,7 +12,7 @@ makedepends="linux-headers libx11-dev libxt-dev" install="" subpackages="$pkgname-dbg" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz - respect-cflags.patch" + respect-env.patch" _srcurl="https://code.9front.org/hg/$pkgname" _srcrev="169f32a871c9" @@ -34,7 +34,14 @@ snapshot() { } build() { - CONF=unix make -C "$builddir" || return 1 + # Building drawterm with -Os currently causes a + # segfault after authentication on alpine. Thus + # disable our own CFLAGS for now. + unset CFLAGS + + CONF=unix make X11INC=/usr/include/X11 \ + X11LIB=/usr/lib/X11 \ + -C "$builddir" || return 1 } package() { @@ -47,8 +54,8 @@ package() { } md5sums="98d9c8d514802b58cbbac50c52185371 drawterm-20170119.tar.gz -e92b5f3aee4482dad62f1669705c42f9 respect-cflags.patch" +e02b5a0df664a5eec50ad58a79988f9c respect-env.patch" sha256sums="aa7e170b39ae014d2687ad4dc99941695b02e4515054b6dfccc01a5261e4db7c drawterm-20170119.tar.gz -dfbe4ef43aefaab8c966b6fd05f7cf304415a0ec9353a43b562eb76c8c8ab6a0 respect-cflags.patch" +30f15a5b48d5f92107d5bedd28d3d619be8afedcb1063df5a94ca2c2609d632d respect-env.patch" sha512sums="fec2895bd01940cd91ed6c4b73fd13ec6a55c5a5b2241f48430a73af44e6e4c649819a2ee9feee1880d4bf27ab007a229c6b5170039b73f1f19f8b0e6d04c510 drawterm-20170119.tar.gz -bd61f4b3c3de2b86bf35afaf95daed1beac3329e6e0f56e476fcd5607c39b83fc5700b6939c2a095e495be7c7708101e83f70074d3afdef1a58396270c23934f respect-cflags.patch" +be42c27a550b49f13fa26cdd698fb4d8387d989141cae1a3671deceb82b9286c9f73772ec9731698c7ecef69949381f9eda8af1dc1d9957fa373752e52f809bb respect-env.patch" diff --git a/testing/drawterm/respect-cflags.patch b/testing/drawterm/respect-cflags.patch deleted file mode 100644 index dabf21332d..0000000000 --- a/testing/drawterm/respect-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -upr drawterm-20161016.orig/Make.unix drawterm-20161016/Make.unix ---- drawterm-20161016.orig/Make.unix 2016-10-16 23:17:32.141093131 +0200 -+++ drawterm-20161016/Make.unix 2016-10-16 23:17:55.724316992 +0200 -@@ -6,7 +6,8 @@ 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 -+CFLAGS?=-O2 -+CFLAGS+=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) - O=o - OS=posix - GUI=x11 diff --git a/testing/drawterm/respect-env.patch b/testing/drawterm/respect-env.patch new file mode 100644 index 0000000000..7bf5db6810 --- /dev/null +++ b/testing/drawterm/respect-env.patch @@ -0,0 +1,22 @@ +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 + 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 ++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) + O=o + OS=posix + GUI=x11 +-LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb ++LDADD=-L$(X11LIB) -lX11 -ggdb + LDFLAGS=$(PTHREAD) + TARG=drawterm + # AUDIO=none |