diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-14 09:42:12 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-14 09:42:12 +0000 |
| commit | 03cceed935615886af3d9551e9fb9b573ce3744a (patch) | |
| tree | fefb362514ed477cab8a0c201ef842c790185635 /devel/ice | |
| parent | Deprecate ports related to no more support vmware versions (diff) | |
- Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: devel)
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=312209
Diffstat (limited to 'devel/ice')
| -rw-r--r-- | devel/ice/Makefile | 5 | ||||
| -rw-r--r-- | devel/ice/files/Make.rules.FreeBSD | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/devel/ice/Makefile b/devel/ice/Makefile index 82f3199c466f..92035bcfc787 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -32,7 +32,7 @@ USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/cpp INSTALL_WRKSRC= ${WRKSRC}/cpp -CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include .if !${PORT_OPTIONS:MDEBUG} CFLAGS+= -DNDEBUG .endif @@ -62,8 +62,7 @@ MAKE_ENV+= NOPORTDOCS=yes .endif post-patch: - @${SED} 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \ - s|%%PREFIX%%|${PREFIX}|g; \ + @${SED} 's|%%PREFIX%%|${PREFIX}|g; \ s|%%DATADIR%%|${DATADIR}|g; \ s|%%DOCSDIR%%|${DOCSDIR}|g; \ s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ diff --git a/devel/ice/files/Make.rules.FreeBSD b/devel/ice/files/Make.rules.FreeBSD index 00b9543ba1cf..03ca1908b79b 100644 --- a/devel/ice/files/Make.rules.FreeBSD +++ b/devel/ice/files/Make.rules.FreeBSD @@ -1,9 +1,9 @@ mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -BASELIBS = -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv +BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv LIBS = -lIce $(BASELIBS) -ICEUTIL_OS_LIBS = %%PTHREAD_LIBS%% +ICEUTIL_OS_LIBS = -pthread PLATFORM_HAS_READLINE := yes |