ufs_public_release: remove libxml2

.gitmodules

@@ -4,8 +4,10 @@
 	branch = ufs_public_release
 [submodule "ccpp/framework"]
 	path = ccpp/framework
-	url = https://github.com/NCAR/ccpp-framework
-	branch = release/public-v4
+	#url = https://github.com/NCAR/ccpp-framework
+	#branch = release/public-v4
+	url = https://github.com/climbfuji/ccpp-framework
+	branch = remove_libxml2
 [submodule "ccpp/physics"]
 	path = ccpp/physics
 	url = https://github.com/NCAR/ccpp-physics

ccpp/build_ccpp.sh

@@ -159,11 +159,6 @@ elif [[ "${MACHINE_ID}" == "linux.gnu" ]]; then
   # netCDF (needed when linking ESMF)
   CCPP_CMAKE_FLAGS="${CCPP_CMAKE_FLAGS} -DNETCDF_DIR=${NETCDF}"
 elif [[ "${MACHINE_ID}" == "gaea.intel" || "${MACHINE_ID}" == "wcoss_cray" ]]; then
-  # Fix broken libxml2 installation on gaea by
-  # using own version (not known to the system)
-  if [[ "${MACHINE_ID}" == "gaea.intel" ]]; then
-    CCPP_CMAKE_FLAGS="${CCPP_CMAKE_FLAGS} -DLIBXML2_LIB_DIR=${LIBXML2_LIB_DIR} -DLIBXML2_INCLUDE_DIR=${LIBXML2_INCLUDE_DIR}"
-  fi
   # DH* At this time, it is not possible to use the dynamic CCPP
   # build on gaea/wcoss_cray. While compiling/linking works, the model
   # crashes immediately. This may be related to 64bit/32bit mismatches
@@ -205,18 +200,16 @@ make ${CCPP_MAKE_FLAGS} install
 
 # Generate ESMF makefile fragment
 
-# Explicitly append libxml2, with or without path
-CCPP_XML2_LIB="${LIBXML2_LIB_DIR:+-L${LIBXML2_LIB_DIR} }-lxml2"
 set -u
 if ( echo "${MAKE_OPT}" | grep STATIC=Y ) ; then
   # Set linker flags for static build
-  CCPP_LINK_OBJS="-L${PATH_CCPP_LIB} -lccpp -lccppphys ${CCPP_XML2_LIB}"
+  CCPP_LINK_OBJS="-L${PATH_CCPP_LIB} -lccpp -lccppphys"
 else
   # Set link objects
   if ( echo "$MACHINE_ID" | grep gaea ) ; then
-    CCPP_LINK_OBJS="-dynamic -L${PATH_CCPP_LIB} -lccpp ${CCPP_XML2_LIB} ${CRAY_PMI_POST_LINK_OPTS} -lpmi"
+    CCPP_LINK_OBJS="-dynamic -L${PATH_CCPP_LIB} -lccpp ${CRAY_PMI_POST_LINK_OPTS} -lpmi"
   else
-    CCPP_LINK_OBJS="-L${PATH_CCPP_LIB} -lccpp ${CCPP_XML2_LIB}"
+    CCPP_LINK_OBJS="-L${PATH_CCPP_LIB} -lccpp"
   fi
 fi
 echo "ESMF_DEP_INCPATH=${PATH_CCPP_INC}" > ${CCPP_MK}