diff options
| author | Craig Rodrigues <rodrigc@FreeBSD.org> | 2007-01-20 17:30:40 +0000 |
|---|---|---|
| committer | Craig Rodrigues <rodrigc@FreeBSD.org> | 2007-01-20 17:30:40 +0000 |
| commit | bfb17f6834c81a5e5d8a34ed79e69fe2f63d0211 (patch) | |
| tree | aa47e0b63a06aba4434e11bb6f67e242dbefc814 /sysutils/hourglass | |
| parent | 18ebf7811d9079864c33f421c33e399d0bf31338 (diff) | |
| download | ports-bfb17f6834c81a5e5d8a34ed79e69fe2f63d0211.tar.gz ports-bfb17f6834c81a5e5d8a34ed79e69fe2f63d0211.zip | |
PR: 108154
- respect PTHREAD_LIBS and PTHREAD_CFLAGS
- add WITH_LINUXTHREADS tunable to override PTHREAD_LIBS and PTHREAD_CFLAGS
with linuxthreads port
Notes
Notes:
svn path=/head/; revision=182866
Diffstat (limited to 'sysutils/hourglass')
| -rw-r--r-- | sysutils/hourglass/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/hourglass/files/patch-configure | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sysutils/hourglass/Makefile b/sysutils/hourglass/Makefile index c6d1bf2b3cf4..8c63e2d70ab4 100644 --- a/sysutils/hourglass/Makefile +++ b/sysutils/hourglass/Makefile @@ -23,15 +23,25 @@ PORTDOCS= CALIBRATION .include <bsd.port.pre.mk> +.if defined(WITH_LINUXTHREADS) + .if ${OSVERSION} >= 500035 +PTHREAD_LIBS= -L${LOCALBASE}/lib -llthread -llgcc_r +PTHREAD_CFLAGS= -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads .else LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif +.endif + post-patch: @${REINPLACE_CMD} -e 's,%LOCALBASE%,${LOCALBASE},g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,%PTHREAD_LIBS%,${PTHREAD_LIBS},g' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,%PTHREAD_CFLAGS%,${PTHREAD_CFLAGS},g' \ + ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) diff --git a/sysutils/hourglass/files/patch-configure b/sysutils/hourglass/files/patch-configure index d1530314f6a6..3a83e19c3822 100644 --- a/sysutils/hourglass/files/patch-configure +++ b/sysutils/hourglass/files/patch-configure @@ -24,8 +24,8 @@ - CFLAGS='-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads' ; + CFLAGS_sav=$CFLAGS ; + LDFLAGS_sav=$LDFLAGS ; -+ LDFLAGS="$LDFLAGS_sav -llthread -llgcc_r -L%LOCALBASE%/lib" ; -+ CFLAGS="$CFLAGS_sav -D_THREAD_SAFE -I%LOCALBASE%/include/pthread/linuxthreads" ; ++ LDFLAGS="$LDFLAGS_sav %PTHREAD_LIBS%" ; ++ CFLAGS="$CFLAGS_sav %PTHREAD_CFLAGS%" ; on_unix='yes' ; on_windows='no' ;; *cygwin*) |