Check-in [e49dbb5c95]
Overview
Comment:Better handling of host platform detection
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:e49dbb5c957e33c148125b13249c2e5d004e159c
User & Date: rkeene on 2019-01-22 22:57:48
Other Links: manifest | tags
Context
2019-02-02
16:40
Updated to find all packages automatically check-in: c0c1150d58 user: rkeene tags: trunk
2019-01-22
22:57
Better handling of host platform detection check-in: e49dbb5c95 user: rkeene tags: trunk
22:52
Slightly better handling of linkadd, may need to make this more generic in the future check-in: 73ac42ec6a user: rkeene tags: trunk
Changes

Modified kitcreator from [dd4b10f457] to [2f1c1a9b4c].

    71     71   	KITCREATOR_ADD_ENABLE_THREADS='1'
    72     72   	KITCREATOR_PKGS="${KITCREATOR_PKGS} thread"
    73     73   elif echo " ${CONFIGUREEXTRA} " | grep ' --disable-threads ' >/dev/null 2>/dev/null; then
    74     74   	KITCREATOR_ADD_ENABLE_THREADS='0'
    75     75   fi
    76     76   
    77     77   # Determine cross-compile status
           78  +kitsh_dir="$(cd kitsh/buildsrc/kitsh-* && pwd)" || exit 1
    78     79   host_os="$(echo " ${CONFIGUREEXTRA} " | sed 's@^.* --host=\([^ ]*\) .*$@\1@
    79     80   t x
    80     81   d
    81     82   :x')"
    82     83   build_os="$(echo " ${CONFIGUREEXTRA} " | sed 's@^.* --build=\([^ ]*\) .*$@\1@
    83     84   t x
    84     85   d
    85     86   :x')"
           87  +
           88  +if [ -z "${build_os}" ]; then
           89  +	build_os="$("${kitsh_dir}/config.guess")"
           90  +else
           91  +	build_os="$("${kitsh_dir}/config.sub" "${build_os}")"
           92  +fi
           93  +if [ -z "${host_os}" ]; then
           94  +	host_os="$("${kitsh_dir}/config.guess")"
           95  +else
           96  +	host_os="$("${kitsh_dir}/config.sub" "${host_os}")"
           97  +fi
    86     98   
    87     99   if [ "${host_os}" != "${build_os}" -a -n "${host_os}" ]; then
    88    100   	KC_CROSSCOMPILE='1'
    89         -	KC_CROSSCOMPILE_HOST_OS="${host_os}"
    90    101   else
    91    102   	KC_CROSSCOMPILE='0'
    92         -	KC_CROSSCOMPILE_HOST_OS=''
    93    103   fi
          104  +KC_CROSSCOMPILE_HOST_OS="${host_os}"
    94    105   export KC_CROSSCOMPILE KC_CROSSCOMPILE_HOST_OS
          106  +unset kitsh_dir
    95    107   
    96    108   # Set default target
    97    109   KITTARGET="kitsh"
    98    110   export KITTARGET
    99    111   
   100    112   # Fix up package list
   101    113   ## If building KitDLL, define it as our target

Modified lmdb/build.sh from [2f79707b46] to [7fd6c7121b].

     8      8   
     9      9   function postinstall() {
    10     10   	local name
    11     11   	local isWindows
    12     12   
    13     13   	# Windows-only
    14     14   	isWindows='false'
    15         -	if [ "${KC_CROSSCOMPILE}" = '1' ]; then
    16         -		case "${KC_CROSSCOMPILE_HOST_OS}" in
    17         -			*-cygwin|*-mingw32|*-mingw32-*|*-cygwin-*)
    18         -				isWindows='true'
    19         -				;;
    20         -		esac
    21         -	else
    22         -		case "${OSTYPE}" in
    23         -			msys|win*|cygwin)
    24         -				isWindows='true'
    25         -				;;
    26         -		esac
    27         -	fi
           15  +	case "${KC_CROSSCOMPILE_HOST_OS}" in
           16  +		*-cygwin|*-mingw32|*-mingw32-*|*-cygwin-*)
           17  +			isWindows='true'
           18  +			;;
           19  +	esac
    28     20   
    29     21   	if [ "${isWindows}" = 'true' ]; then
    30     22   		find "${installdir}" -type -f -name '*.a' | while IFS='' read -r name; do
    31     23   			echo '-lntdll' > "${name}.linkadd"
    32     24   		done
    33     25   	fi
    34     26   }