diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-28 10:51:58 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-28 10:51:58 +0000 |
| commit | 100d65b37a9bddd5f4aa468bbef3ac27a9d8d5d9 (patch) | |
| tree | ae18db5e53b8dc7dbd4ce8e2d3f0eec05e53d1f4 /sysutils/hourglass | |
| parent | 298de7b9f06266310120b24ed8c489ca75032733 (diff) | |
| download | ports-100d65b37a9bddd5f4aa468bbef3ac27a9d8d5d9.tar.gz ports-100d65b37a9bddd5f4aa468bbef3ac27a9d8d5d9.zip | |
- Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: sysutils)
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=313088
Diffstat (limited to 'sysutils/hourglass')
| -rw-r--r-- | sysutils/hourglass/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/hourglass/files/patch-configure | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sysutils/hourglass/Makefile b/sysutils/hourglass/Makefile index aedb9557e5ee..48d78a30e5dd 100644 --- a/sysutils/hourglass/Makefile +++ b/sysutils/hourglass/Makefile @@ -25,17 +25,19 @@ PORTDOCS= CALIBRATION .include <bsd.port.pre.mk> .if defined(WITH_LINUXTHREADS) -PTHREAD_LIBS= -L${LOCALBASE}/lib -llthread -llgcc_r -PTHREAD_CFLAGS= -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads +THREAD_LIBS= -L${LOCALBASE}/lib -llthread -llgcc_r +THREAD_CFLAGS= -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +.else +THREAD_LIBS= -pthread .endif post-patch: @${REINPLACE_CMD} -e 's,%LOCALBASE%,${LOCALBASE},g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,%PTHREAD_LIBS%,${PTHREAD_LIBS},g' \ + @${REINPLACE_CMD} -e 's,%THREAD_LIBS%,${THREAD_LIBS},g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,%PTHREAD_CFLAGS%,${PTHREAD_CFLAGS},g' \ + @${REINPLACE_CMD} -e 's,%THREAD_CFLAGS%,${THREAD_CFLAGS},g' \ ${WRKSRC}/configure post-install: diff --git a/sysutils/hourglass/files/patch-configure b/sysutils/hourglass/files/patch-configure index 3a83e19c3822..eec66c760b42 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 %PTHREAD_LIBS%" ; -+ CFLAGS="$CFLAGS_sav %PTHREAD_CFLAGS%" ; ++ LDFLAGS="$LDFLAGS_sav %THREAD_LIBS%" ; ++ CFLAGS="$CFLAGS_sav %THREAD_CFLAGS%" ; on_unix='yes' ; on_windows='no' ;; *cygwin*) |