diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2014-03-25 14:30:21 +0800 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2014-03-25 14:30:21 +0800 |
| commit | 374d0a5419d8ec96404cc545b3aae8b29ab36af9 (patch) | |
| tree | e87f4481abb013ebd519f951cd824be8b546e9e7 /science/mpqc | |
| parent | 1474f498e4896ef78d3a750e743efa4277ae52ea (diff) | |
| download | freebsd-ports-gnome-374d0a5419d8ec96404cc545b3aae8b29ab36af9.tar.gz freebsd-ports-gnome-374d0a5419d8ec96404cc545b3aae8b29ab36af9.tar.zst freebsd-ports-gnome-374d0a5419d8ec96404cc545b3aae8b29ab36af9.zip | |
support LDFLAGS (fixes libghemical)
PR: 187801
Submitted by: tijl@
Diffstat (limited to 'science/mpqc')
| -rw-r--r-- | science/mpqc/Makefile | 13 | ||||
| -rw-r--r-- | science/mpqc/files/patch-LocalMakefile.in | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile index 8c379b1ac49d..b7ca1092064a 100644 --- a/science/mpqc/Makefile +++ b/science/mpqc/Makefile @@ -3,7 +3,7 @@ PORTNAME= mpqc PORTVERSION= 2.3.1 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= science parallel MASTER_SITES= SF @@ -59,7 +59,8 @@ CXXFLAGS= -O3 -tpp7 -xMKW -Vaxlib CONFIGURE_ARGS+=--with-cc=${CC} \ --with-cxx=${CXX} \ --with-f77=${FC} \ - --with-libdirs=-L${LOCALBASE}/lib \ + --with-include="-I${WRKDIR} -I${LOCALBASE}/include" \ + --with-libdirs="-L${LOCALBASE}/lib ${LDFLAGS}" \ --with-blas="${BLAS}" \ --with-lapack="${LAPACK}" \ --with-coptflags="${CFLAGS}" \ @@ -71,15 +72,9 @@ CONFIGURE_ARGS+=--with-cc=${CC} \ CONFIGURE_ARGS+=--with-libs="-lsvml" .endif .if defined(WITH_MPICH) -CONFIGURE_ARGS+=--with-libdirs="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"\ - --enable-always-use-mpi +CONFIGURE_ARGS+=--enable-always-use-mpi CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" .endif -.if defined(WITH_MPICH) -CONFIGURE_ARGS+=--with-include="-I${LOCALBASE}/include -I${WRKDIR} -I${LOCALBASE}/include" -.else -CONFIGURE_ARGS+=--with-include="-I${WRKDIR} -I${LOCALBASE}/include" -.endif MPQC_COMMAND= ${PREFIX}/bin/mpqc diff --git a/science/mpqc/files/patch-LocalMakefile.in b/science/mpqc/files/patch-LocalMakefile.in index c16457ad0ee4..520bf6406387 100644 --- a/science/mpqc/files/patch-LocalMakefile.in +++ b/science/mpqc/files/patch-LocalMakefile.in @@ -5,10 +5,10 @@ LTLINK = $(LIBTOOL) --mode=link ifneq ($(BUILDID),) - LTLINKLIBOPTS = -rpath $(libdir) -release $(BUILDID) -version-info $(SC_SO_VERSION) -+ LTLINKLIBOPTS = %%EXTRARPATH%% -rpath $(libdir) -release $(BUILDID) -version-info $(SC_SO_VERSION) ++ LTLINKLIBOPTS = $(LDFLAGS) -rpath $(libdir) -release $(BUILDID) -version-info $(SC_SO_VERSION) else - LTLINKLIBOPTS = -rpath $(libdir) -version-info $(SC_SO_VERSION) -+ LTLINKLIBOPTS = %%EXTRARPATH%% -rpath $(libdir) -version-info $(SC_SO_VERSION) ++ LTLINKLIBOPTS = $(LDFLAGS) -rpath $(libdir) -version-info $(SC_SO_VERSION) endif LTLINKBINOPTS = LTCOMP = $(LIBTOOL) --mode=compile |