Merge branch 'master' into check

common/xbps-src/libexec/build.sh

@@ -33,7 +33,6 @@ show_pkg_build_options
 check_pkg_arch $XBPS_CROSS_BUILD
 
 if [ -z "$XBPS_CROSS_PREPARE" ]; then
-    install_cross_pkg $XBPS_CROSS_BUILD || exit $?
     prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
 fi
 if [ -z "$XBPS_DEPENDENCY" -a -z "$XBPS_TEMP_MASTERDIR" -a -n "$XBPS_KEEP_ALL" -a "$XBPS_CHROOT_CMD" = "proot" ]; then
@@ -44,6 +43,10 @@ if [ "$PKGNAME" != "$XBPS_TARGET_PKG" -o -z "$XBPS_SKIP_DEPS" ]; then
     install_pkg_deps $PKGNAME $XBPS_TARGET_PKG pkg $XBPS_CROSS_BUILD $XBPS_CROSS_PREPARE || exit $?
 fi
 
+if [ -z "$XBPS_CROSS_PREPARE" ]; then
+    install_cross_pkg $XBPS_CROSS_BUILD || exit $?
+fi
+
 # Fetch distfiles after installing required dependencies,
 # because some of them might be required for do_fetch().
 $XBPS_LIBEXECDIR/xbps-src-dofetch.sh $SOURCEPKG $XBPS_CROSS_BUILD || exit 1

common/xbps-src/shutils/chroot.sh

@@ -1,5 +1,7 @@
 # vim: set ts=4 sw=4 et:
 
+# FIXME: $XBPS_FFLAGS is not set when chroot_init() is run
+# It is set in common/build-profiles/bootstrap.sh but lost somewhere?
 chroot_init() {
     XBPSSRC_CF=$XBPS_MASTERDIR/etc/xbps/xbps-src.conf
 
@@ -15,6 +17,7 @@ _EOF
 XBPS_MASTERDIR=/
 XBPS_CFLAGS="$XBPS_CFLAGS"
 XBPS_CXXFLAGS="$XBPS_CXXFLAGS"
+XBPS_FFLAGS="-fPIC -pipe"
 XBPS_CPPFLAGS="$XBPS_CPPFLAGS"
 XBPS_LDFLAGS="$XBPS_LDFLAGS"
 XBPS_HOSTDIR=/host

common/xbps-src/shutils/common.sh

@@ -219,7 +219,7 @@ setup_pkg() {
     basepkg=${pkg%-32bit}
 
     # Start with a sane environment
-    unset -v PKG_BUILD_OPTIONS XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS XBPS_CROSS_LDFLAGS
+    unset -v PKG_BUILD_OPTIONS XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_FFLAGS XBPS_CROSS_CPPFLAGS XBPS_CROSS_LDFLAGS
     unset -v subpackages run_depends build_depends host_build_depends
 
     unset_package_funcs
@@ -249,7 +249,7 @@ setup_pkg() {
 
     else
         export XBPS_TARGET_MACHINE=${XBPS_ARCH:-$XBPS_MACHINE}
-        unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS
+        unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS XBPS_CROSS_FFLAGS
         unset XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS
 
         XBPS_INSTALL_XCMD="$XBPS_INSTALL_CMD"
@@ -380,6 +380,7 @@ setup_pkg() {
 
     export CFLAGS="$XBPS_TARGET_CFLAGS $XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags"
     export CXXFLAGS="$XBPS_TARGET_CXXFLAGS $XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags"
+    export FFLAGS="$XBPS_TARGET_FFLAGS $XBPS_FFLAGS $XBPS_CROSS_FFLAGS $FFLAGS"
     export CPPFLAGS="$XBPS_TARGET_CPPFLAGS $XBPS_CPPFLAGS $XBPS_CROSS_CPPFLAGS $CPPFLAGS"
     export LDFLAGS="$XBPS_TARGET_LDFLAGS $XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
 
@@ -388,21 +389,25 @@ setup_pkg() {
     export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
     export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
     export BUILD_LDFLAGS="$XBPS_LDFLAGS"
+    export BUILD_FFLAGS="$XBPS_FFLAGS"
 
     export CC_FOR_BUILD="cc"
     export CXX_FOR_BUILD="g++"
     export CPP_FOR_BUILD="cpp"
+    export FC_FOR_BUILD="gfortran"
     export LD_FOR_BUILD="ld"
     export CFLAGS_FOR_BUILD="$XBPS_CFLAGS"
     export CXXFLAGS_FOR_BUILD="$XBPS_CXXFLAGS"
     export CPPFLAGS_FOR_BUILD="$XBPS_CPPFLAGS"
     export LDFLAGS_FOR_BUILD="$XBPS_LDFLAGS"
+    export FFLAGS_FOR_BUILD="$XBPS_FFLAGS"
 
     if [ -n "$cross" ]; then
         # Regular tools names
         export CC="${XBPS_CROSS_TRIPLET}-gcc"
         export CXX="${XBPS_CROSS_TRIPLET}-c++"
         export CPP="${XBPS_CROSS_TRIPLET}-cpp"
+        export FC="${XBPS_CROSS_TRIPLET}-gfortran"
         export GCC="$CC"
         export LD="${XBPS_CROSS_TRIPLET}-ld"
         export AR="${XBPS_CROSS_TRIPLET}-ar"
@@ -418,6 +423,7 @@ setup_pkg() {
         export CXX_target="$CXX"
         export CPP_target="$CPP"
         export GCC_target="$GCC"
+        export FC_target="$FC"
         export LD_target="$LD"
         export AR_target="$AR"
         export AS_target="$AS"
@@ -437,6 +443,7 @@ setup_pkg() {
         export CXX_host="g++"
         export CPP_host="cpp"
         export GCC_host="$CC_host"
+        export FC_host="gfortran"
         export LD_host="ld"
         export AR_host="ar"
         export AS_host="as"
@@ -456,6 +463,7 @@ setup_pkg() {
         export CXX="g++"
         export CPP="cpp"
         export GCC="$CC"
+        export FC="gfortran"
         export LD="ld"
         export AR="ar"
         export AS="as"
@@ -466,10 +474,10 @@ setup_pkg() {
         export NM="nm"
         export READELF="readelf"
         # Unse cross evironment variables
-        unset CC_target CXX_target CPP_target GCC_target LD_target AR_target AS_target
+        unset CC_target CXX_target CPP_target GCC_target FC_target LD_target AR_target AS_target
         unset RANLIB_target STRIP_target OBJDUMP_target OBJCOPY_target NM_target READELF_target
         unset CFLAGS_target CXXFLAGS_target CPPFLAGS_target LDFLAGS_target
-        unset CC_host CXX_host CPP_host GCC_host LD_host AR_host AS_host
+        unset CC_host CXX_host CPP_host GCC_host FC_host LD_host AR_host AS_host
         unset RANLIB_host STRIP_host OBJDUMP_host OBJCOPY_host NM_host READELF_host
         unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host
     fi