1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-15 03:14:23 +00:00

- Unbreak on 5.x

- Unbreak on !i386 (tested on amd64)

PR:		ports/76591
Submitted by:	Sam Lawrance <boris@brooknet.com.au>
This commit is contained in:
Pav Lucistnik 2005-01-24 20:34:54 +00:00
parent 6f55f2197b
commit 5d63691210
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=127221
3 changed files with 23 additions and 10 deletions

View File

@ -18,7 +18,7 @@ COMMENT= A library which provides OO thread interface for C++ programmers
USE_GMAKE= yes
USE_REINPLACE= yes
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
ONLY_FOR_ARCHS= i386
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
MAKEFILE= GNUmakefile
@ -28,12 +28,10 @@ ALL_TARGET= opt
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 502126
BROKEN= "Does not compile on FreeBSD >= 5.x"
.endif
post-patch:
@${REINPLACE_CMD} -e 's,%%CXXFLAGS%%,${CXXFLAGS},g' \
${WRKSRC}/Make/makedefs
@${FIND} ${WRKSRC} -name '*.o' -delete
@${FIND} ${WRKSRC} -name '*.so' -delete
.include <bsd.port.post.mk>

View File

@ -1,14 +1,15 @@
--- Make/makedefs.orig Thu Oct 16 19:33:14 2003
+++ Make/makedefs Thu Oct 16 19:38:33 2003
--- Make/makedefs.orig Thu Oct 2 16:56:31 2003
+++ Make/makedefs Mon Jan 24 21:28:13 2005
@@ -252,15 +252,22 @@
CXX = g++
endif
DEPARG = -MM
- INC += -I/usr/local/include -I/usr/X11R6/include
+ INC += -I${LOCALBASE}/include -I${X11BASE}/include
DEF += -W -Wall
- DEF += -W -Wall
- OPTF = -O2
+ OPTF = %%CXXFLAGS%%
+ INC += -I${LOCALBASE}/include -I${X11BASE}/include
+ DEF += -W -Wall -fPIC
+ OPTF = -O -pipe
DBGF = -g
SHARED = -shared
ARCH = 32

View File

@ -0,0 +1,14 @@
--- pthread_src/PThreadConditionPrivateData.h.orig Sun Jan 23 14:06:58 2005
+++ pthread_src/PThreadConditionPrivateData.h Sun Jan 23 14:07:12 2005
@@ -24,9 +24,10 @@
#ifndef _PTHREADCONDITIONPRIVATEDATA_H_
#define _PTHREADCONDITIONPRIVATEDATA_H_
+#include <pthread.h>
+
namespace OpenThreads {
-#include <pthread.h>
#include <OpenThreads/Condition>
class PThreadConditionPrivateData {