Add fixes to work with/with-out X Signed-off-by: Khem Raj <[email protected]> --- meta-oe/recipes-devtools/mpich/mpich_3.2.bb | 47 ------------------- meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb | 18 +++++-- 2 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-devtools/mpich/mpich_3.2.bb
diff --git a/meta-oe/recipes-devtools/mpich/mpich_3.2.bb b/meta-oe/recipes-devtools/mpich/mpich_3.2.bb deleted file mode 100644 index 51b313cef4..0000000000 --- a/meta-oe/recipes-devtools/mpich/mpich_3.2.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Message Passing Interface (MPI) implementation" -HOMEPAGE = "http://www.mpich.org/"; -SECTION = "devel" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2106f0435056f3dd9349747a766e5816" - -SRC_URI = " \ - http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "f414cfa77099cd1fa1a5ae4e22db508a" -SRC_URI[sha256sum] = "0778679a6b693d7b7caff37ff9d2856dc2bfc51318bf8373859bfa74253da3dc" - -RDEPENDS_${PN} += "bash perl libxml2" -S = "${WORKDIR}/${BP}" - -EXTRA_OECONF = "--enable-debuginfo \ - --enable-fast \ - --enable-shared \ - --with-pm=gforker \ - --disable-rpath \ - --disable-f77 \ - --disable-fc \ - --disable-fortran \ - --disable-cxx \ - BASH_SHELL='${USRBINPATH}/env bash' \ - PERL='${USRBINPATH}/env perl' \ -" - -inherit autotools-brokensep gettext - -do_configure_prepend() { - for d in confdb test/mpi/confdb src/openpa/confdb src/pm/hydra/confdb src/pm/hydra/tools/topo/hwloc/hwloc/config src/pm/hydra/mpl/confdb src/mpl/confdb src/mpi/romio/confdb; do - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d - done - - autoreconf --verbose --install --force -I . -I confdb/ -I maint/ - oe_runconf - exit -} - -do_install_append() { - sed -i 's,${S}/,,g' ${D}/${libdir}/libmpi.la - sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}/${libdir}/pkgconfig/mpich.pc -} diff --git a/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb b/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb index e5f36a5140..77e080c8b8 100644 --- a/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb +++ b/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb @@ -19,10 +19,18 @@ EXTRA_OECONF = "--enable-debuginfo \ --disable-fc \ --disable-fortran \ --disable-cxx \ - --with-device=ch4:ucx \ + BASH_SHELL='${USRBINPATH}/env bash' \ + PERL='${USRBINPATH}/env perl' \ + --with-device=ch3:nemesis \ + --with-rdmacm=no \ --disable-numa \ " +PACKAGECONFIG += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ +" +PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" + inherit autotools gettext pkgconfig do_configure() { @@ -33,10 +41,10 @@ do_configure() { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d done - cd ${S} - autoupdate - autoreconf --verbose --install --force - cd ${B} +# cd ${S} +# autoupdate +# autoreconf --verbose --install --force +# cd ${B} oe_runconf } -- 2.30.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#89816): https://lists.openembedded.org/g/openembedded-devel/message/89816 Mute This Topic: https://lists.openembedded.org/mt/81036692/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
