Changeset 22378 for main/trunk/greenstone2/common-src/packages
- Timestamp:
- 2010-07-12T15:06:25+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/packages/configure
r22058 r22378 140 140 fi 141 141 142 #Configure and compile 32-bit expat 143 if test -e Makefile ; then 144 echo make distclean && \ 145 make distclean 146 fi 147 142 148 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 143 149 … … 151 157 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $ENVIRONMENT 152 158 159 echo make distclean && \ 160 make distclean 161 162 if test ! -z "$COMPAT32BITFLAGS" ; then 163 #Configure and compile 64-bit expat 164 echo ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 165 166 cd "$PACKAGES/expat/expat-1.95.8" && \ 167 ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 168 169 echo make $ENVIRONMENT 170 make $ENVIRONMENT 171 172 echo make install $ENVIRONMENT 173 make install $ENVIRONMENT 174 fi 175 176 echo make distclean && \ 177 make distclean 153 178 154 179 # configure and compile libiconv during configuration stage … … 163 188 164 189 # configure 190 cd "$PACKAGES/iconv/libiconv-1.13.1" 191 192 if test -e Makefile ; then 193 echo make distclean && \ 194 make distclean 195 fi 196 165 197 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 166 cd "$PACKAGES/iconv/libiconv-1.13.1" && \ 198 167 199 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 168 200 … … 176 208 177 209 if test ! -z "$COMPAT32BITFLAGS" ; then 178 echo "Generating native 64-bit version as well"210 echo "Generating native 64-bit version of iconv" 179 211 # used in apache web server, for example 180 212 181 # dist clean 182 cd "$PACKAGES/iconv/libiconv-1.13.1" 213 # distclean 183 214 echo make distclean && \ 184 215 make distclean 185 216 186 217 # configure 187 echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64"$HOSTTARGETFLAGS $ENVIRONMENT218 echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 188 219 ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 189 220 … … 193 224 194 225 # make install 226 echo make install $ENVIRONMENT 195 227 make install $ENVIRONMENT 196 make install $ENVIRONMENT 197 198 fi 228 fi 229 230 echo make distclean && \ 231 make distclean 199 232 200 233 #./configure $CACHE_FILE --prefix="$PACKAGES/iconv" --disable-shared $HOSTTARGETFLAGS&&
Note:
See TracChangeset
for help on using the changeset viewer.