diff options
| author | gahr <gahr@FreeBSD.org> | 2013-02-07 22:57:49 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2013-02-07 22:57:49 +0800 |
| commit | 41a58f4e1885bda03c851ec5eeb46a0b2018fd34 (patch) | |
| tree | e9433273f8212799f1369d579fb61a5ee351bcda /cad/opencascade | |
| parent | 18feecf11aa7aebf13c924e5725f6b6bc6e1ca6f (diff) | |
| download | freebsd-ports-gnome-41a58f4e1885bda03c851ec5eeb46a0b2018fd34.tar.gz freebsd-ports-gnome-41a58f4e1885bda03c851ec5eeb46a0b2018fd34.tar.zst freebsd-ports-gnome-41a58f4e1885bda03c851ec5eeb46a0b2018fd34.zip | |
- Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: cad)
Approved by: portmgr
Diffstat (limited to 'cad/opencascade')
| -rw-r--r-- | cad/opencascade/Makefile | 8 | ||||
| -rw-r--r-- | cad/opencascade/files/patch-ros_adm_make_DRAWEXE_Makefile.in | 2 | ||||
| -rw-r--r-- | cad/opencascade/files/patch-ros_adm_make_WOKSH_Makefile.in | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index 35861bcc1409..9154c5b5a545 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -62,10 +62,11 @@ CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --enable-production=yes CONFIGURE_ENV= ARCH=${ARCH} LD=${CXX} CPPFLAGS+= ${CXXFLAGS} ${GCC4WA} -I${LOCALBASE}/include \ - -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} + -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \ + -DUSE_INTERP_RESULT # We strip the libs MAKE_ENV= INSTALL_STRIP_FLAG=-s OCC_BUILDDIR="${PATCH_WRKSRC}" \ - OCC_INSTALLDIR="${OCCROOT}" PTHREAD_LIBS="${PTHREAD_LIBS}" LD=${CXX} + OCC_INSTALLDIR="${OCCROOT}" LD=${CXX} USE_LDCONFIG= yes STL_COMPILER?= gcc @@ -140,9 +141,6 @@ pre-configure: ${WRKSRC}/src/WOKBuilderDef/CMPLRS.edl \ ${WRKSRC}/src/WOKBuilderDef/LDEXE.edl \ ${WRKSRC}/src/WOKBuilderDef/LDSHR.edl - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} \ - ${WRKSRC}/src/WOKBuilderDef/CSF.edl pre-install: ${MKDIR} ${CASROOT} diff --git a/cad/opencascade/files/patch-ros_adm_make_DRAWEXE_Makefile.in b/cad/opencascade/files/patch-ros_adm_make_DRAWEXE_Makefile.in index 161e95122605..7673cf582d91 100644 --- a/cad/opencascade/files/patch-ros_adm_make_DRAWEXE_Makefile.in +++ b/cad/opencascade/files/patch-ros_adm_make_DRAWEXE_Makefile.in @@ -5,7 +5,7 @@ DRAWEXE$(EXEEXT): $(DRAWEXE_OBJECTS) $(DRAWEXE_DEPENDENCIES) @rm -f DRAWEXE$(EXEEXT) - $(CXXLINK) $(DRAWEXE_LDFLAGS) $(DRAWEXE_OBJECTS) $(DRAWEXE_LDADD) $(LIBS) -+ $(CXXLINK) $(DRAWEXE_LDFLAGS) $(DRAWEXE_OBJECTS) $(DRAWEXE_LDADD) $(LIBS) $(PTHREAD_LIBS) ++ $(CXXLINK) $(DRAWEXE_LDFLAGS) $(DRAWEXE_OBJECTS) $(DRAWEXE_LDADD) $(LIBS) -pthread mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core diff --git a/cad/opencascade/files/patch-ros_adm_make_WOKSH_Makefile.in b/cad/opencascade/files/patch-ros_adm_make_WOKSH_Makefile.in index 7596d5ca61a2..3e9250052aad 100644 --- a/cad/opencascade/files/patch-ros_adm_make_WOKSH_Makefile.in +++ b/cad/opencascade/files/patch-ros_adm_make_WOKSH_Makefile.in @@ -5,7 +5,7 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -+LIBS = @LIBS@ $(PTHREAD_LIBS) ++LIBS = @LIBS@ -pthread LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ |