Check-in [f4d5d0f507]
Overview
Comment:Updated to override site-local autoconf brokenness on some 64-bit systems
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:f4d5d0f507b4c7758c6b18259cfd633f7921604f
User & Date: rkeene on 2012-05-06 20:26:46
Other Links: manifest | tags
Context
2012-05-06
22:05
Updated to fix bug build [cb7ed6affe] in build script -- need a better solution check-in: 592228c7b0 user: rkeene tags: trunk
20:26
Updated to override site-local autoconf brokenness on some 64-bit systems check-in: f4d5d0f507 user: rkeene tags: trunk
2012-02-24
23:55
Added syntax for specifying a seperate Fossil tag for Tk check-in: 896a0f9701 user: rkeene tags: trunk
Changes

Modified itcl/build.sh from [aadeaa622b] to [43d006685d].

    80     80   			export TEA_PLATFORM
    81     81   			;;
    82     82   	esac
    83     83   	sed 's@TEA_PLATFORM=@test -z "$TEA_PLATFORM" \&\& &@' configure > configure.new && cat configure.new > configure
    84     84   	rm -f configure.new
    85     85   
    86     86   	# Build
    87         -	echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    88         -	./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           87  +	echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
           88  +	./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    89     89   
    90     90   	echo "Running: ${MAKE:-make}"
    91     91   	${MAKE:-make} || exit 1
    92     92   
    93     93   	echo "Running: ${MAKE:-make} install"
    94     94   	${MAKE:-make} install
    95     95   

Modified mk4tcl/build.sh from [d61f1ae923] to [e6168c799d].

   111    111   		# so that it can be linked into the shared object
   112    112   		if [ "${isshared}" = "0" -a "${KITTARGET}" = "kitdll" ]; then
   113    113   			CXXFLAGS="${SAVE_CXXFLAGS} -fPIC"
   114    114   			export CXXFLAGS
   115    115   		fi
   116    116   
   117    117   		(
   118         -			echo "Running: ./configure $tryopt --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}/../generic\" ${CONFIGUREEXTRA}"
   119         -			./configure $tryopt --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
          118  +			echo "Running: ./configure $tryopt --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}/../generic\" ${CONFIGUREEXTRA}"
          119  +			./configure $tryopt --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
   120    120   
   121    121   			echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\""
   122    122   			${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" || exit 1
   123    123   
   124    124   			echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\" install"
   125    125   			${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" install || exit 1
   126    126   		) || continue

Modified tcl/build.sh from [5770c0fd3d] to [96b0881095].

   169    169   		rm -f 'tclConfig.sh'
   170    170   
   171    171   		cd "${BUILDDIR}/${dir}" || exit 1
   172    172   
   173    173   		# Remove broken pre-generated Makfiles
   174    174   		rm -f GNUmakefile Makefile makefile
   175    175   
   176         -		echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" ${CONFIGUREEXTRA}"
   177         -		./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" ${CONFIGUREEXTRA}
          176  +		echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" ${CONFIGUREEXTRA}"
          177  +		./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" ${CONFIGUREEXTRA}
   178    178   
   179    179   		echo "Running: ${MAKE:-make}"
   180    180   		${MAKE:-make} || continue
   181    181   
   182    182   		echo "Running: ${MAKE:-make} install"
   183    183   		${MAKE:-make} install || (
   184    184   			# Work with Tcl 8.6.x's TCLSH_NATIVE solution for

Modified tclvfs/build.sh from [5371b35f64] to [f2a658ae10].

    76     76   	# If we are building for KitDLL, compile with '-fPIC'
    77     77   	if [ "${KITTARGET}" = "kitdll" ]; then
    78     78   		CFLAGS="${CFLAGS} -fPIC"
    79     79   		export CFLAGS
    80     80   	fi
    81     81   
    82     82   	# Build static version
    83         -	echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    84         -	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           83  +	echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
           84  +	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    85     85   
    86     86   	echo "Running: ${MAKE:-make}"
    87     87   	${MAKE:-make} || exit 1
    88     88   
    89     89   	echo "Running: ${MAKE:-make} install"
    90     90   	${MAKE:-make} install || exit 1
    91     91   

Modified thread/build.sh from [a7634f1812] to [3ea6ef540b].

    63     63   	if [ ! -d '../buildsrc' ]; then
    64     64   		gzip -dc "../${SRC}" | tar -xf -
    65     65   	else
    66     66   		cp -rp ../buildsrc/* './'
    67     67   	fi
    68     68   
    69     69   	cd "${BUILDDIR}" || exit 1
    70         -	echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    71         -	./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           70  +	echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
           71  +	./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    72     72   
    73     73   	echo "Running: ${MAKE:-make}"
    74     74   	${MAKE:-make} || exit 1
    75     75   
    76     76   	echo "Running: ${MAKE:-make} install"
    77     77   	${MAKE:-make} install
    78     78   

Modified tk/build.sh from [7c1e6640bc] to [90853f5f0d].

   177    177   				CPPFLAGS="${CPPFLAGS} -D_WIN32_IE=0x0501"
   178    178   				CFLAGS="${CFLAGS} -D_WIN32_IE=0x0501"
   179    179   				export CPPFLAGS CFLAGS
   180    180   			fi
   181    181   		fi
   182    182   
   183    183   		if [ "${STATICTK}" = "1" ]; then
   184         -			echo "Running: ./configure --disable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
   185         -			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
          184  +			echo "Running: ./configure --disable-shared --disable-symbols --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
          185  +			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
   186    186   		else
   187         -			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
   188         -			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
          187  +			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
          188  +			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
   189    189   		fi
   190    190   
   191    191   		echo "Running: ${MAKE:-make}"
   192    192   		${MAKE:-make} || (
   193    193   			# Workaround a bug in Tk on FreeBSD 8.1:
   194    194   			#   https://sourceforge.net/tracker/?func=detail&atid=112997&aid=3107390&group_id=12997
   195    195   			LIBTKFILE="$(ls libtk*.so.1 2>/dev/null | head -1)"

Modified zlib/build.sh from [5c73bcd9f1] to [63363c4e1f].

    50     50   	if [ "${KITTARGET}" = "kitdll" ]; then
    51     51   		CFLAGS="${CFLAGS} -fPIC"
    52     52   		export CFLAGS
    53     53   	fi
    54     54   
    55     55   	# We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf
    56     56   	# script and will puke
    57         -	echo "Running: ./configure --prefix=\"${INSTDIR}\""
    58         -	./configure --prefix="${INSTDIR}"
           57  +	echo "Running: ./configure --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\""
           58  +	./configure --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib"
    59     59   
    60     60   	echo "Running: ${MAKE:-make} AR=\"${AR}\""
    61     61   	${MAKE:-make} AR="${AR}" || exit 1
    62     62   
    63     63   	echo "Running: ${MAKE:-make} install AR=\"${AR}\""
    64     64   	${MAKE:-make} install AR="${AR}"
    65     65   
    66     66   	# We don't really care too much about failure in zlib
    67     67   	exit 0
    68     68   ) || exit 1
    69     69   
    70     70   exit 0