Check-in [df5accddbb]
Overview
Comment:Give it another try. Mac builds are cross-compilations
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: df5accddbba43b93ff9eee5f210eeec66452936e
User & Date: ssoberni on 2015-10-23 20:43:59
Other Links: manifest | tags
Context
2015-10-23
21:38
Third attempt: Provide a Tcl 8.4 wrapper, tested using tclsh8.4 as TCLSH_NATIVE check-in: dca99d9485 user: ssoberni tags: trunk
20:43
Give it another try. Mac builds are cross-compilations check-in: df5accddbb user: ssoberni tags: trunk
20:09
Use TCLSH_NATIVE only when cross-compiling (as indicated by KC_CROSSCOMPILE) check-in: 40706ce9b4 user: ssoberni tags: trunk
Changes

Modified nsf/build.sh from [756d463b89] to [007052aec1].

101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
	rm -f configure.new
	
	(
	    # Build
	    echo "Running: ./configure $tryopt --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
	    ./configure $tryopt --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}

	    if [ "${KC_CROSSCOMPILE}" = '1' ]; then
                ## Cross-compiling, use TCLSH_NATIVE
		echo "Running: ${MAKE:-make} TCLSH=${TCLSH_NATIVE}"
		${MAKE:-make} TCLSH=${TCLSH_NATIVE} || exit 1
		
		echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}"
		${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1
	    else
		echo "Running: ${MAKE:-make}"
		${MAKE:-make} || exit 1
		
		echo "Running: ${MAKE:-make} install"
		${MAKE:-make} install || exit 1
            fi
	    
	) || continue
	
	break
    done
    
    mkdir "${OUTDIR}/lib" || exit 1
    cp -r "${INSTDIR}/lib"/nsf*/serialize "${OUTDIR}/lib/nsf${NSFVERS}-serialize"







<
<
|
|
|
|
<
<
<
|
|
|
|
<
|







101
102
103
104
105
106
107


108
109
110
111



112
113
114
115

116
117
118
119
120
121
122
123
	rm -f configure.new
	
	(
	    # Build
	    echo "Running: ./configure $tryopt --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
	    ./configure $tryopt --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}



	    echo "Running: ${MAKE:-make}"
	    ${MAKE:-make} || exit 1

	    echo "Running: ${MAKE:-make} install"



	    ${MAKE:-make} install || (
		## cross-compiling? use TCLSH_NATIVE
		echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}"
		${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1

	    ) || exit 1
	) || continue
	
	break
    done
    
    mkdir "${OUTDIR}/lib" || exit 1
    cp -r "${INSTDIR}/lib"/nsf*/serialize "${OUTDIR}/lib/nsf${NSFVERS}-serialize"