Changeset 21432 for main


Ignore:
Timestamp:
2010-01-06T17:30:17+13:00 (14 years ago)
Author:
davidb
Message:

Update to use of -m32, which is activated when compiling on a 64-bit machine. The requirement for needing to using -m32 is mg and mg++ (which currently only work with 32-bit sized data-types). If both --disable-mg and --disable-mgpp are specified this means that we don't need to use -m32. Configure files updated to detect this and 'cancel' the -m32 flag.

Location:
main/trunk/greenstone2
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/build-src/configure

    r18214 r21432  
    31333133  fi
    31343134fi
     3135
     3136# Only need compat32bitflag if using MG or MGPP
     3137if test "$ENABLE_MG" = "0" ; then
     3138  COMPAT32BITFLAGS=
     3139else
     3140  if test "$ENABLE_MGPP" = "0" ; then
     3141    COMPAT32BITFLAGS=
     3142  fi
     3143fi
     3144
    31353145export COMPAT32BITFLAGS
    31363146

  • main/trunk/greenstone2/build-src/configure.in

    r18214 r21432  
    115115  fi
    116116fi
     117
     118# Only need compat32bitflag if using MG or MGPP
     119if test "$ENABLE_MG" = "0" ; then
     120  COMPAT32BITFLAGS=
     121else
     122  if test "$ENABLE_MGPP" = "0" ; then
     123    COMPAT32BITFLAGS=
     124  fi
     125fi
     126
    117127export COMPAT32BITFLAGS
    118128AC_SUBST(COMPAT32BITFLAGS)

  • main/trunk/greenstone2/common-src/configure

    r21418 r21432  
    32333233  fi
    32343234fi
     3235
     3236# Only need compat32bitflag if using MG or MGPP
     3237if test "$ENABLE_MG" = "0" ; then
     3238  COMPAT32BITFLAGS=
     3239else
     3240  if test "$ENABLE_MGPP" = "0" ; then
     3241    COMPAT32BITFLAGS=
     3242  fi
     3243fi
     3244
    32353245export COMPAT32BITFLAGS
    32363246

  • main/trunk/greenstone2/common-src/configure.in

    r21417 r21432  
    178178  fi
    179179fi
     180
     181# Only need compat32bitflag if using MG or MGPP
     182if test "$ENABLE_MG" = "0" ; then
     183  COMPAT32BITFLAGS=
     184else
     185  if test "$ENABLE_MGPP" = "0" ; then
     186    COMPAT32BITFLAGS=
     187  fi
     188fi
     189
    180190export COMPAT32BITFLAGS
    181191AC_SUBST(COMPAT32BITFLAGS)

  • main/trunk/greenstone2/common-src/packages/configure

    r21419 r21432  
    158158
    159159# configure
    160 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
     160echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
    161161cd "$PACKAGES/iconv/libiconv-1.13.1" && \
    162 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
     162CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
    163163
    164164# make
    … …  
    169169echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
    170170CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
     171
     172if test ! -z "$COMPAT32BITFLAGS" ; then
     173  echo "Generating native 64-bit version as well"
     174  # used in apache web server, for example
     175
     176  # dist clean
     177  cd "$PACKAGES/iconv/libiconv-1.13.1"
     178  echo make distclean && \
     179  make distclean
     180
     181  # configure
     182  echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
     183  ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
     184
     185  # make
     186  echo make $HOSTTARGETFLAGS $ENVIRONMENT
     187  make $HOSTTARGETFLAGS $ENVIRONMENT
     188
     189  # make install
     190  make install $HOSTTARGETFLAGS $ENVIRONMENT
     191  make install $HOSTTARGETFLAGS $ENVIRONMENT
     192
     193fi
    171194
    172195#./configure $CACHE_FILE --prefix="$PACKAGES/iconv" --disable-shared $HOSTTARGETFLAGS&&

  • main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/configure

    r18345 r21432  
    75207520
    75217521
    7522 echo "$as_me:$LINENO: checking to see if architecture is 64-bit" >&5
    7523 echo $ECHO_N "checking to see if architecture is 64-bit... $ECHO_C" >&6
    7524 arch_64bit=no
    7525 case "$host_cpu" in
    7526 x86_64) arch_64bit=yes ;;
    7527 esac
    7528 
    7529 if test "$arch_64bit" = yes; then
    7530   echo "$as_me:$LINENO: result: yes" >&5
    7531 echo "${ECHO_T}yes" >&6
    7532   if test -z "$COMPAT32BITFLAGS" ; then
    7533     COMPAT32BITFLAGS="-m32"
    7534   fi
    7535 else
    7536   echo "$as_me:$LINENO: result: no" >&5
    7537 echo "${ECHO_T}no" >&6
    7538   if test -z "$COMPAT32BITFLAGS" ; then
    7539     COMPAT32BITFLAGS=
    7540   fi
    7541 fi
    7542 export COMPAT32BITFLAGS
     7522
     7523
     7524cat >>confdefs.h <<_ACEOF
     7525#define COMPAT32BITFLAGS $COMPAT32BITFLAGS
     7526_ACEOF
     7527
    75437528
    75447529

  • main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/configure.in

    r18345 r21432  
    1616dnl AC_C_BIGENDIAN([])
    1717
    18 AC_MSG_CHECKING(to see if architecture is 64-bit)
    19 arch_64bit=no
    20 case "$host_cpu" in
    21 x86_64) arch_64bit=yes ;;
    22 esac
     18dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     19dnl arch_64bit=no
     20dnl case "$host_cpu" in
     21dnl x86_64) arch_64bit=yes ;;
     22dnl esac
     23dnl
     24dnl if test "$arch_64bit" = yes; then
     25dnl   AC_MSG_RESULT(yes)
     26dnl   if test -z "$COMPAT32BITFLAGS" ; then
     27dnl     COMPAT32BITFLAGS="-m32"
     28dnl     LIBTOOLCOMPAT32BITFLAGS="-Wl,-m32"
     29dnl   fi
     30dnl else
     31dnl   AC_MSG_RESULT(no)
     32dnl   if test -z "$COMPAT32BITFLAGS" ; then
     33dnl     COMPAT32BITFLAGS=
     34dnl     LIBTOOLCOMPAT32BITFLAGS=
     35dnl   fi
     36dnl fi
     37dnl export COMPAT32BITFLAGS
     38dnl AC_SUBST(COMPAT32BITFLAGS)
    2339
    24 if test "$arch_64bit" = yes; then
    25   AC_MSG_RESULT(yes)
    26   if test -z "$COMPAT32BITFLAGS" ; then
    27     COMPAT32BITFLAGS="-m32"
    28     LIBTOOLCOMPAT32BITFLAGS="-Wl,-m32"
    29   fi
    30 else
    31   AC_MSG_RESULT(no)
    32   if test -z "$COMPAT32BITFLAGS" ; then
    33     COMPAT32BITFLAGS=
    34     LIBTOOLCOMPAT32BITFLAGS=
    35   fi
    36 fi
    37 export COMPAT32BITFLAGS
     40
     41AC_DEFINE_UNQUOTED(COMPAT32BITFLAGS, $COMPAT32BITFLAGS)
    3842AC_SUBST(COMPAT32BITFLAGS)
    3943

  • main/trunk/greenstone2/configure

    r21418 r21432  
    32483248  fi
    32493249fi
     3250
     3251# Only need compat32bitflag if using MG or MGPP
     3252if test "$ENABLE_MG" = "0" ; then
     3253  COMPAT32BITFLAGS=
     3254else
     3255  if test "$ENABLE_MGPP" = "0" ; then
     3256    COMPAT32BITFLAGS=
     3257  fi
     3258fi
     3259
    32503260export COMPAT32BITFLAGS
    32513261

  • main/trunk/greenstone2/configure.in

    r21417 r21432  
    189189  fi
    190190fi
     191
     192# Only need compat32bitflag if using MG or MGPP
     193if test "$ENABLE_MG" = "0" ; then
     194  COMPAT32BITFLAGS=
     195else
     196  if test "$ENABLE_MGPP" = "0" ; then
     197    COMPAT32BITFLAGS=
     198  fi
     199fi
     200
    191201export COMPAT32BITFLAGS
    192202AC_SUBST(COMPAT32BITFLAGS)

  • main/trunk/greenstone2/runtime-src/configure

    r21329 r21432  
    32053205  fi
    32063206fi
     3207
     3208# Only need compat32bitflag if using MG or MGPP
     3209if test "$ENABLE_MG" = "0" ; then
     3210  COMPAT32BITFLAGS=
     3211else
     3212  if test "$ENABLE_MGPP" = "0" ; then
     3213    COMPAT32BITFLAGS=
     3214  fi
     3215fi
     3216
    32073217export COMPAT32BITFLAGS
    32083218

  • main/trunk/greenstone2/runtime-src/configure.in

    r21329 r21432  
    159159  fi
    160160fi
     161
     162# Only need compat32bitflag if using MG or MGPP
     163if test "$ENABLE_MG" = "0" ; then
     164  COMPAT32BITFLAGS=
     165else
     166  if test "$ENABLE_MGPP" = "0" ; then
     167    COMPAT32BITFLAGS=
     168  fi
     169fi
     170
    161171export COMPAT32BITFLAGS
    162172AC_SUBST(COMPAT32BITFLAGS)
Note: See TracChangeset for help on using the changeset viewer.