build with recent glib change regarding pthread

noticed by naddy@
This commit is contained in:
jcs 2002-01-20 23:51:31 +00:00
parent 8e816f0352
commit 60b9c67dda
2 changed files with 12 additions and 12 deletions

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_top_enable_nls,v 1.1 2002/01/06 21:06:50 jcs Exp $
--- Makefile.top_enable_nls.orig Sun Jan 6 14:35:55 2002
+++ Makefile.top_enable_nls Sun Jan 6 14:39:10 2002
$OpenBSD: patch-Makefile_top_enable_nls,v 1.2 2002/01/20 23:51:31 jcs Exp $
--- Makefile.top_enable_nls.orig Wed Dec 5 01:41:15 2001
+++ Makefile.top_enable_nls Sun Jan 20 17:36:54 2002
@@ -79,15 +79,15 @@
GTOP_LIBS = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau
@ -21,12 +21,13 @@ $OpenBSD: patch-Makefile_top_enable_nls,v 1.1 2002/01/06 21:06:50 jcs Exp $
export GTK_CONFIG GTOP_INCLUDE GTOP_LIBS SYS_LIBS EXTRAOBJS BINMODE
export INSTALLDIR INCLUDEDIR INCLUDEMODE INCLUDEDIRMODE LOCALEDIR
@@ -139,7 +139,7 @@
@@ -139,8 +139,7 @@
openbsd:
(cd po && ${MAKE} all)
(cd src && ${MAKE} GTK_CONFIG=gtk-config GTOP_LIBS= GTOP_INCLUDE= \
- PTHREAD_INC=-I/usr/local/include EXTRAOBJS= \
+ PTHREAD_INC=-I${LOCALBASE}/include/pth EXTRAOBJS= \
SYS_LIBS="-lkvm" gkrellm )
- SYS_LIBS="-lkvm" gkrellm )
+ SYS_LIBS="-lkvm -pthread" gkrellm )
solaris:
(cd po && ${MAKE} MSGFMT_OPT="-v -o" \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_src,v 1.4 2002/01/06 21:06:50 jcs Exp $
--- src/Makefile.src.orig Sun Jan 6 14:42:03 2002
+++ src/Makefile.src Sun Jan 6 14:46:26 2002
$OpenBSD: patch-src_Makefile_src,v 1.5 2002/01/20 23:51:31 jcs Exp $
--- src/Makefile.src.orig Thu Dec 20 13:09:48 2001
+++ src/Makefile.src Sun Jan 20 17:38:58 2002
@@ -1,15 +1,15 @@
GTK_CONFIG ?= gtk-config
EXTRAOBJS ?= md5c.o
@ -40,14 +40,13 @@ $OpenBSD: patch-src_Makefile_src,v 1.4 2002/01/06 21:06:50 jcs Exp $
OBJS = main.o alerts.o apm.o base64.o clock.o cpu.o disk.o fs.o hostname.o \
inet.o mail.o meminfo.o net.o proc.o sensors.o uptime.o \
@@ -63,6 +62,10 @@
@@ -63,6 +62,9 @@
netbsd:
$(MAKE) PTHREAD_INC=-I/usr/local/include \
GTK_CONFIG=gtk-config GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm
+
+openbsd:
+ $(MAKE) PTHREAD_INC=-I${LOCALBASE}/include/pth \
+ GTK_CONFIG=gtk-config GTOP_LIBS= SYS_LIBS="-lkvm" gkrellm
+ $(MAKE) GTK_CONFIG=gtk-config GTOP_LIBS= SYS_LIBS="-lkvm -pthread" gkrellm
solaris:
$(MAKE) CFLAGS="-Wno-implicit-int" \