freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert the pkgconfig change in r320019. It didn't work and my initial

Browse Source 
efforts to fix it didn't work.  The result wouldn't have been useful
enough to spend more effor on it.
This commit is contained in:
Brooks Davis
2013-06-07 14:38:46 +00:00
parent 21f55c222a
commit 0f5ef01ec3
4 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/openmpi/Makefile
View File

@@ -5,7 +5,7 @@
PORTNAME= openmpi
DISTVERSION= 1.6.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= net parallel
MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.6/downloads/

14
net/openmpi/files/patch-ompi_tools_wrappers_Makefile.in
View File

@@ -1,14 +0,0 @@
$FreeBSD$
--- ompi/tools/wrappers/Makefile.in.orig
+++ ompi/tools/wrappers/Makefile.in
@@ -1152,7 +1152,7 @@
top_srcdir = @top_srcdir@
man_pages = mpicc.1 mpic++.1 mpicxx.1 mpif77.1 mpif90.1
@OPAL_WANT_SCRIPT_WRAPPER_COMPILERS_TRUE@bin_SCRIPTS = ompi_wrapper_script
-@OMPI_INSTALL_BINARIES_TRUE@@OPAL_WANT_SCRIPT_WRAPPER_COMPILERS_FALSE@pkgconfigdir = $(libdir)/pkgconfig
+@OMPI_INSTALL_BINARIES_TRUE@@OPAL_WANT_SCRIPT_WRAPPER_COMPILERS_FALSE@pkgconfigdir = libdata/pkgconfig
@OMPI_INSTALL_BINARIES_TRUE@@OPAL_WANT_SCRIPT_WRAPPER_COMPILERS_FALSE@pkgconfig_DATA = ompi.pc ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc
@OMPI_INSTALL_BINARIES_TRUE@@OPAL_WANT_SCRIPT_WRAPPER_COMPILERS_FALSE@man_MANS = $(man_pages)
@OMPI_INSTALL_BINARIES_TRUE@@OPAL_WANT_SCRIPT_WRAPPER_COMPILERS_FALSE@dist_pkgdata_DATA = \

14
net/openmpi/files/patch-orte_tools_wrappers_Makefile.in
View File

@@ -1,14 +0,0 @@
$FreeBSD$
--- orte/tools/wrappers/Makefile.in.orig
+++ orte/tools/wrappers/Makefile.in
@@ -1151,7 +1151,7 @@
@ORTE_DISABLE_FULL_SUPPORT_FALSE@ ortecc-wrapper-data.txt \
@ORTE_DISABLE_FULL_SUPPORT_FALSE@ ortec++-wrapper-data.txt
-@OMPI_INSTALL_BINARIES_TRUE@@OPAL_WANT_SCRIPT_WRAPPER_COMPILERS_FALSE@@ORTE_DISABLE_FULL_SUPPORT_FALSE@pkgconfigdir = $(libdir)/pkgconfig
+@OMPI_INSTALL_BINARIES_TRUE@@OPAL_WANT_SCRIPT_WRAPPER_COMPILERS_FALSE@@ORTE_DISABLE_FULL_SUPPORT_FALSE@pkgconfigdir = libdata/pkgconfig
@OMPI_INSTALL_BINARIES_TRUE@@OPAL_WANT_SCRIPT_WRAPPER_COMPILERS_FALSE@@ORTE_DISABLE_FULL_SUPPORT_FALSE@pkgconfig_DATA = orte.pc
all: all-am

13
net/openmpi/pkg-plist
View File

@@ -296,12 +296,12 @@
%%MPIDIR%%/lib/openmpi/mca_topo_unity.so
%%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.la
%%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.so
%%MPIDIR%%/libdata/pkgconfig/ompi-c.pc
%%MPIDIR%%/libdata/pkgconfig/ompi-cxx.pc
%%MPIDIR%%/libdata/pkgconfig/ompi-f77.pc
%%MPIDIR%%/libdata/pkgconfig/ompi-f90.pc
%%MPIDIR%%/libdata/pkgconfig/ompi.pc
%%MPIDIR%%/libdata/pkgconfig/orte.pc
%%MPIDIR%%/lib/pkgconfig/ompi-c.pc
%%MPIDIR%%/lib/pkgconfig/ompi-cxx.pc
%%MPIDIR%%/lib/pkgconfig/ompi-f77.pc
%%MPIDIR%%/lib/pkgconfig/ompi-f90.pc
%%MPIDIR%%/lib/pkgconfig/ompi.pc
%%MPIDIR%%/lib/pkgconfig/orte.pc
%%MPIDIR%%/share/openmpi/amca-param-sets/example.conf
%%MPIDIR%%/share/openmpi/help-coll-sync.txt
%%MPIDIR%%/share/openmpi/help-dash-host.txt
@@ -469,6 +469,7 @@
@dirrm %%MPIDIR%%/man/man1
@dirrm %%MPIDIR%%/man
@dirrm %%MPIDIR%%/lib/openmpi
@dirrm %%MPIDIR%%/lib/pkgconfig
@dirrm %%MPIDIR%%/lib
@dirrm %%MPIDIR%%/include/vampirtrace
@dirrm %%MPIDIR%%/include/openmpi/ompi/mpi/cxx