[MacPorts] #40194: muniversal: pre-merge hook for each destroot
MacPorts
noreply at macports.org
Tue Aug 20 09:38:02 PDT 2013
#40194: muniversal: pre-merge hook for each destroot
------------------------+--------------------------------
Reporter: jeremyhu@… | Owner: macports-tickets@…
Type: defect | Status: new
Priority: Normal | Milestone:
Component: ports | Version: 2.2.0
Keywords: | Port:
------------------------+--------------------------------
We should have a hook that is executed for each arch's destroot prior to
merging them in the muniversal PortGroup.
This would give us a good place to fix conflicts such as this one in
mpich:
{{{
$ diff -Naurp
/opt/local/var/macports/build/_Users_jeremy_src_macports_trunk_dports_science_mpich/mpich/work/destroot-{i386,x86_64}/opt/local/lib/pkgconfig/mpich.pc
---
/opt/local/var/macports/build/_Users_jeremy_src_macports_trunk_dports_science_mpich/mpich/work/destroot-i386/opt/local/lib/pkgconfig/mpich.pc
2013-08-20 09:31:01.000000000 -0700
+++
/opt/local/var/macports/build/_Users_jeremy_src_macports_trunk_dports_science_mpich/mpich/work
/destroot-x86_64/opt/local/lib/pkgconfig/mpich.pc 2013-08-20
09:30:58.000000000 -0700
@@ -9,12 +9,12 @@ Description: High Performance and portab
Version: 3.0.4
URL: http://www.mcs.anl.gov/research/projects/mpich
Requires:
-Libs: -L/opt/local/lib -Wl,-headerpad_max_install_names -arch i386
-Wl,-flat_namespace -L${libdir} -lpmpich -lmpich -lopa -lmpl -lpthread
-Cflags: -pipe -Os -arch i386 -I${includedir}
+Libs: -L/opt/local/lib -Wl,-headerpad_max_install_names -arch x86_64
-Wl,-flat_namespace -L${libdir} -lpmpich -lmpich -lopa -lmpl -lpthread
+Cflags: -pipe -Os -arch x86_64 -I${includedir}
# pkg-config does not understand Cxxflags, etc. So we allow users to
# query them using the --variable option
-cxxflags= -pipe -Os -arch i386 -I${includedir}
-fflags=-pipe -Os -m32 -I${includedir}
-fcflags=-pipe -Os -m32 -I${includedir}
+cxxflags= -pipe -Os -arch x86_64 -I${includedir}
+fflags=-pipe -Os -m64 -I${includedir}
+fcflags=-pipe -Os -m64 -I${includedir}
}}}
We just need to strip the arch specific CFLAGS out of the pkgconfig file,
but we have no good place to do that.
--
Ticket URL: <https://trac.macports.org/ticket/40194>
MacPorts <http://www.macports.org/>
Ports system for OS X
More information about the macports-tickets
mailing list