diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-05-20 09:04:44 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-05-20 09:04:44 +0000 |
| commit | eafa3c4544ba71bd043f3ec8daa3c1bc02bd52e6 (patch) | |
| tree | 6f87279ac215b7785b357f09eda6e0d93ada0103 /wm/wmii/patches | |
| parent | cb3d715b8ad4ad3cd74e8d94904391edd7da5d8f (diff) | |
| download | pkgsrc-eafa3c4544ba71bd043f3ec8daa3c1bc02bd52e6.tar.gz | |
Fix build on SunOS.
Diffstat (limited to 'wm/wmii/patches')
| -rw-r--r-- | wm/wmii/patches/patch-aa | 16 | ||||
| -rw-r--r-- | wm/wmii/patches/patch-util_compile | 31 |
2 files changed, 43 insertions, 4 deletions
diff --git a/wm/wmii/patches/patch-aa b/wm/wmii/patches/patch-aa index 37d9b157ab8..6ed7d7fd181 100644 --- a/wm/wmii/patches/patch-aa +++ b/wm/wmii/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2012/05/27 18:13:59 marino Exp $ +$NetBSD: patch-aa,v 1.9 2013/05/20 09:04:44 jperkin Exp $ --- config.mk.orig 2007-11-16 13:59:15.000000000 +0000 +++ config.mk @@ -20,18 +20,20 @@ $NetBSD: patch-aa,v 1.8 2012/05/27 18:13:59 marino Exp $ # Includes and libs INCPATH = .:${ROOT}/include:${INCLUDE}:/usr/include -@@ -14,8 +13,8 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib +@@ -14,9 +13,9 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib # Flags include ${ROOT}/mk/gcc.mk -CFLAGS += -g -O0 -DIXPlint -LDFLAGS += -g ${LIBS} +-STATIC = -static +CFLAGS += -DIXPlint +LDFLAGS += ${LIBS} - STATIC = -static ++#STATIC = -static MKDEP = cpp -M -@@ -32,8 +31,7 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/u + # Compiler +@@ -32,13 +31,12 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/u INCX11 = -I/usr/X11R6/include LIBX11 = -L/usr/X11R6/lib -lX11 LIBICONV = # Leave blank if your libc includes iconv (glibc does) @@ -41,3 +43,9 @@ $NetBSD: patch-aa,v 1.8 2012/05/27 18:13:59 marino Exp $ # Solaris #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" + #LDFLAGS = ${LIBS} -R${PREFIX}/lib +-#LDFLAGS += -lsocket -lnsl ++LDFLAGS += -lsocket -lnsl + #CFLAGS += -xtarget=ultra + + diff --git a/wm/wmii/patches/patch-util_compile b/wm/wmii/patches/patch-util_compile new file mode 100644 index 00000000000..b1ff343f4ff --- /dev/null +++ b/wm/wmii/patches/patch-util_compile @@ -0,0 +1,31 @@ +$NetBSD: patch-util_compile,v 1.1 2013/05/20 09:04:44 jperkin Exp $ + +--- util/compile.orig 2007-11-16 13:59:15.000000000 +0000 ++++ util/compile +@@ -1,7 +1,7 @@ +-#!/bin/sh -f ++#!@SH@ -f + + outfile="$1"; shift +-bin="$(echo $0 | sed 's,/[^/]*$,,')" ++bin="$(echo $0 | @SED@ 's,/[^/]*$,,')" + + # Derived from Russ Cox's 9c in plan9port. + +@@ -12,12 +12,12 @@ echo CC $($bin/cleanname ${BASE}$outfile + $CC -o $outfile $CFLAGS $@ 2>$xtmp + status=$? + +-base=$(echo $BASE | sed 's/,/\\,/g') ++base=$(echo $BASE | @SED@ 's/,/\\,/g') + re='\([^[:space:]/]*\..:[0-9]\)' + +-cat $xtmp | sed "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" | +- egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion' | +- sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' | ++cat $xtmp | @SED@ "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" | ++ @EGREP@ -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion' | ++ @SED@ 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' | + uniq 1>&2 + + rm -f $xtmp |