Date: Thu, 18 Aug 2005 14:03:09 +0200 (CEST) From: Johan van Selst <johans@stack.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/85088: devel/ngpt: unbreak on FreeBSD >= 6.0 Message-ID: <20050818120309.1AE826981@hammer.stack.nl> Resent-Message-ID: <200508181210.j7ICAFtw003889@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85088
>Category: ports
>Synopsis: devel/ngpt: unbreak on FreeBSD >= 6.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 18 12:10:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Johan van Selst
>Release: FreeBSD 6.0-BETA2 amd64
>Organization:
>Environment:
System: FreeBSD hammer.stack.nl 6.0-BETA2 FreeBSD 6.0-BETA2 #1: Tue Aug 16 17:51:03 CEST 2005 root@hammer.stack.nl:/usr/obj/usr/src/sys/HAMMER amd64
>Description:
Avoid conflicts with the system pthread.
>How-To-Repeat:
>Fix:
This patch introduces two extra files
files/patch-pthread.h.in
files/patch-uthread_spinlock.c
diff -uNr ngpt/Makefile ngpt/Makefile
--- ngpt/Makefile Thu Jul 21 14:09:53 2005
+++ ngpt/Makefile Thu Aug 18 13:42:57 2005
@@ -27,8 +27,4 @@
BROKEN= "Does not compile on !i386 and !amd64"
.endif
-.if ${OSVERSION} >= 600031
-BROKEN= "Does not compile on FreeBSD >= 6.0"
-.endif
-
.include <bsd.port.post.mk>
diff -uNr ngpt/files/patch-pthread.h.in ngpt/files/patch-pthread.h.in
--- ngpt/files/patch-pthread.h.in Thu Jan 1 01:00:00 1970
+++ ngpt/files/patch-pthread.h.in Thu Aug 18 13:49:23 2005
@@ -0,0 +1,10 @@
+--- pthread.h.in.orig Thu Aug 18 13:49:14 2005
++++ pthread.h.in Thu Aug 18 13:49:07 2005
+@@ -50,6 +50,7 @@
+ #define _SYS_PTHREAD_H_
+ #define SYS_PTHREAD_INCLUDED
+ #define _SYS_PTHREAD_INCLUDED
++#define _SYS__PTHREADTYPES_H_
+ #ifdef _PTHREAD_PRIVATE
+ #define BITS_PTHREADTYPES_H
+ #define _BITS_PTHREADTYPES_H
diff -uNr ngpt/files/patch-uthread_spinlock.c ngpt/files/patch-uthread_spinlock.c
--- ngpt/files/patch-uthread_spinlock.c Thu Jan 1 01:00:00 1970
+++ ngpt/files/patch-uthread_spinlock.c Thu Aug 18 13:45:59 2005
@@ -0,0 +1,14 @@
+--- uthread_spinlock.c.orig Thu Aug 18 13:45:38 2005
++++ uthread_spinlock.c Thu Aug 18 13:44:36 2005
+@@ -33,10 +33,10 @@
+ *
+ */
+
++#include <pthread.h>
+ #include <stdio.h>
+ #include <sched.h>
+ #include <unistd.h>
+-#include <pthread.h>
+ #include <string.h>
+ #include "spinlock.h"
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050818120309.1AE826981>