Changeset 15551


Ignore:
Timestamp:
2008-05-17T10:01:24+12:00 (16 years ago)
Author:
davidb
Message:

Introduction of COMPAT32BITFLAGS to confirugre and Makefile.in files to help compile Greenstone on a 64-bit machine

Location:
gsdl/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/configure

    r15512 r15551  
    311311
    312312ac_subdirs_all="$ac_subdirs_all packages indexers"
    313 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_ACCENTFOLD CFLAGS CC LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
     313ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_ACCENTFOLD LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
    314314ac_subst_files=''
    315315
    … …  
    14271427
    14281428LDFLAGS=$LDFLAGS
     1429
    14291430if test -z "$CFLAGS"; then
    14301431CFLAGS=-O2
    14311432fi
     1433
    14321434
    14331435
    … …  
    31033105  RANLIB="$ac_cv_prog_RANLIB"
    31043106fi
     3107
     3108
     3109echo "$as_me:$LINENO: checking to see if architecture is 64-bit" >&5
     3110echo $ECHO_N "checking to see if architecture is 64-bit... $ECHO_C" >&6
     3111arch_64bit=no
     3112case "$host_cpu" in
     3113x86_64) arch_64bit=yes ;;
     3114esac
     3115
     3116if test "$arch_64bit" = yes; then
     3117  echo "$as_me:$LINENO: result: yes" >&5
     3118echo "${ECHO_T}yes" >&6
     3119  if test -z "$COMPAT32BITFLAGS" ; then
     3120    COMPAT32BITFLAGS="-m32"
     3121  fi
     3122else
     3123  echo "$as_me:$LINENO: result: no" >&5
     3124echo "${ECHO_T}no" >&6
     3125  if test -z "$COMPAT32BITFLAGS" ; then
     3126    COMPAT32BITFLAGS=
     3127  fi
     3128fi
     3129export COMPAT32BITFLAGS
     3130
    31053131
    31063132
    … …  
    80408066s,@USE_YAZ@,$USE_YAZ,;t t
    80418067s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
     8068s,@LDFLAGS@,$LDFLAGS,;t t
    80428069s,@CFLAGS@,$CFLAGS,;t t
    80438070s,@CC@,$CC,;t t
    8044 s,@LDFLAGS@,$LDFLAGS,;t t
    80458071s,@CPPFLAGS@,$CPPFLAGS,;t t
    80468072s,@ac_ct_CC@,$ac_ct_CC,;t t
    … …  
    80718097s,@RANLIB@,$RANLIB,;t t
    80728098s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
     8099s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t
    80738100s,@MICO_VER@,$MICO_VER,;t t
    80748101s,@CPP@,$CPP,;t t

  • gsdl/trunk/configure.in

    r15300 r15551  
    7373dnl Checks for programs.
    7474LDFLAGS=$LDFLAGS
     75AC_SUBST(LDFLAGS)
    7576dnl only set CFLAGS if not already set in environment
    7677if test -z "$CFLAGS"; then
    … …  
    7879fi
    7980AC_SUBST(CFLAGS)
     81
    8082
    8183AC_PROG_CC
    … …  
    9294AC_PROG_MAKE_SET
    9395AC_PROG_RANLIB
     96
     97AC_MSG_CHECKING(to see if architecture is 64-bit)
     98arch_64bit=no
     99case "$host_cpu" in
     100x86_64) arch_64bit=yes ;;
     101esac
     102
     103if test "$arch_64bit" = yes; then
     104  AC_MSG_RESULT(yes)
     105  if test -z "$COMPAT32BITFLAGS" ; then
     106    COMPAT32BITFLAGS="-m32"
     107  fi
     108else
     109  AC_MSG_RESULT(no)
     110  if test -z "$COMPAT32BITFLAGS" ; then
     111    COMPAT32BITFLAGS=
     112  fi
     113fi
     114export COMPAT32BITFLAGS
     115AC_SUBST(COMPAT32BITFLAGS)
     116
    94117
    95118#moved CORBA MICO directory test to get version of MICO

  • gsdl/trunk/packages/configure

    r15456 r15551  
    220220gzip -dc expat-1.95.8.tar.gz | tar -xf -
    221221cd "$PACKAGES/expat/expat-1.95.8" && \
    222 ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
     222CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
    223223
    224224# configure XML::Parser perl module

  • gsdl/trunk/src/colservr/Makefile.in

    r15546 r15551  
    3232AR = ar
    3333CC = @CC@
    34 CPP = @CXX@
    35 CFLAGS = @CFLAGS@
    36 CPPFLAGS = @CXXFLAGS@
     34CXX = @CXX@
     35CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
     36CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    3737DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
    3838# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    … …  
    4545
    4646COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES)
    47 CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     47CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    4848
    4949
    … …  
    5555.SUFFIXES: .cpp .o
    5656.cpp.o:
    57     $(CPPCOMPILE) $<
     57    $(CXXCOMPILE) $<
    5858
    5959
    … …  
    133133
    134134depend:
    135     makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
     135    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)

  • gsdl/trunk/src/gdbmedit/db2txt/Makefile.in

    r15230 r15551  
    3030AR = ar
    3131CC = @CC@
    32 CPP = @CXX@
    33 CCFLAGS = -Wall @CFLAGS@
     32CXX = @CXX@
     33CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
     34CXXFLAGS= -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
    3435DEFS = @DEFS@
    3536RANLIB = @RANLIB@
    3637INCLUDES = -I../../../lib @GDBM_INCLUDE@
    37 LDFLAGS = @LDFLAGS@
     38LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    3839DPLIBS =
    3940LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
    … …  
    4142INSTALL = @INSTALL@
    4243 
    43 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
    44 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     44COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
     45CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    4546LINK = $(CC) $(LDFLAGS) -o $@
    46 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     47CXXLINK = $(CXX) $(LDFLAGS) -o $@
    4748 
    4849.SUFFIXES:
    … …  
    5354.SUFFIXES: .cpp .o
    5455.cpp.o:
    55     $(CPPCOMPILE) $<
     56    $(CXXCOMPILE) $<
    5657 
    5758
    … …  
    7778
    7879depend:
    79     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     80    makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    8081
    8182
    … …  
    8586
    8687db2txt: $(DB2TXT_OBJS) $(DPLIBS)
    87     $(CPPLINK) $(DB2TXT_OBJS) $(LIBS)
     88    $(CXXLINK) $(DB2TXT_OBJS) $(LIBS)

  • gsdl/trunk/src/gdbmedit/gdbmget/Makefile.in

    r15230 r15551  
    3030AR = ar
    3131CC = @CC@
    32 CPP = @CXX@
    33 CCFLAGS = -Wall @CFLAGS@
     32CXX = @CXX@
     33CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
     34CXXFLAGS = -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
    3435DEFS = @DEFS@
    3536RANLIB = @RANLIB@
    3637INCLUDES = -I../../lib @GDBM_INCLUDE@
    37 LDFLAGS = @LDFLAGS@
     38LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    3839DPLIBS =
    3940LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
    … …  
    4142INSTALL = @INSTALL@
    4243 
    43 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
    44 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     44COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
     45CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    4546LINK = $(CC) $(LDFLAGS) -o $@
    46 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     47CXXLINK = $(CXX) $(LDFLAGS) -o $@
    4748 
    4849.SUFFIXES:
    … …  
    5354.SUFFIXES: .cpp .o
    5455.cpp.o:
    55     $(CPPCOMPILE) $<
     56    $(CXXCOMPILE) $<
    5657 
    5758
    … …  
    7778
    7879depend:
    79     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     80    makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    8081
    8182# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

  • gsdl/trunk/src/gdbmedit/gdbmset/Makefile.in

    r15230 r15551  
    3030AR = ar
    3131CC = @CC@
    32 CPP = @CXX@
    33 CCFLAGS = -Wall @CFLAGS@
     32CXX = @CXX@
     33CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
     34CXXFLAGS = -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
    3435DEFS = @DEFS@
    3536RANLIB = @RANLIB@
    3637INCLUDES = -I../../lib @GDBM_INCLUDE@
    37 LDFLAGS = @LDFLAGS@
     38LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    3839DPLIBS =
    3940LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
    … …  
    4142INSTALL = @INSTALL@
    4243 
    43 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
    44 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     44COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
     45CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    4546LINK = $(CC) $(LDFLAGS) -o $@
    46 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     47CXXLINK = $(CXX) $(LDFLAGS) -o $@
    4748 
    4849.SUFFIXES:
    … …  
    5354.SUFFIXES: .cpp .o
    5455.cpp.o:
    55     $(CPPCOMPILE) $<
     56    $(CXXCOMPILE) $<
    5657 
    5758
    … …  
    7778
    7879depend:
    79     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     80    makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    8081
    8182# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

  • gsdl/trunk/src/gdbmedit/txt2db/Makefile.in

    r15230 r15551  
    2929AR = ar
    3030CC = @CC@
    31 CPP = @CXX@
    32 CCFLAGS = -Wall @CFLAGS@
     31CXX = @CXX@
     32CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
     33CXXFLAGS = -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
    3334DEFS = @DEFS@
    3435RANLIB = @RANLIB@
    3536INCLUDES = -I../../../lib @GDBM_INCLUDE@
    36 LDFLAGS = @LDFLAGS@
     37LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    3738INDEXERS_DIR=../../../indexers
    3839DPLIBS = ../../../lib/gsdllib.a $(INDEXERS_DIR)/mg/lib/unitool.o
    … …  
    4142INSTALL = @INSTALL@
    4243 
    43 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
    44 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     44COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
     45CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    4546MCOMPILE = ../../../bin/linux/mico-c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
    4647LINK = $(CC) $(LDFLAGS) -o $@
    4748MLINK = ../../../bin/linux/mico-ld $(LDFLAGS) -lmico2.2.7 -o $@
    48 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     49CXXLINK = $(CXX) $(LDFLAGS) -o $@
    4950 
    5051.SUFFIXES:
    … …  
    5556.SUFFIXES: .cpp .o
    5657.cpp.o:
    57     $(CPPCOMPILE) $<
     58    $(CXXCOMPILE) $<
    5859 
    5960.SUFFIXES: .mpp .o
    … …  
    8283
    8384depend:
    84     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     85    makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    8586
    8687
    … …  
    9091
    9192txt2db: $(TXT2DB_OBJS) $(DPLIBS)
    92     $(CPPLINK) $(TXT2DB_OBJS) $(LIBS)
     93    $(CXXLINK) $(TXT2DB_OBJS) $(LIBS)
    9394
    9495

  • gsdl/trunk/src/oaiservr/Makefile.in

    r15546 r15551  
    4040endif
    4141
     42CC = @CC@
     43CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
    4244
    43 CPP = @CXX@
    44 CPPFLAGS = @CXXFLAGS@
     45CXX = @CXX@
     46CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    4547INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
    46 LDFLAGS = @LDFLAGS@
     48LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    4749LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS)
    4850INSTALL = @INSTALL@
    4951
    5052
    51 CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(INCLUDES)
    52 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     53CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(INCLUDES)
     54CXXLINK = $(CXX) $(LDFLAGS) -o $@
    5355
    5456
    … …  
    5658.SUFFIXES: .cpp .o
    5759.cpp.o:
    58     $(CPPCOMPILE) -o $@ $<
     60    $(CXXCOMPILE) -o $@ $<
    5961
    6062
    … …  
    121123
    122124oaiserver: $(EXECUTABLE_OBJECTS)
    123     $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
     125    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    124126
    125127all: $(EXECUTABLE)
    … …  
    135137
    136138depend:
    137     makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
     139    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)

  • gsdl/trunk/src/recpt/Makefile.in

    r15546 r15551  
    6363
    6464
    65 CPP = @CXX@
    66 CPPFLAGS = @CXXFLAGS@
     65CC = @CC@
     66CFLAGS=@CFLAGS@ @COMPAT32BITFLAGS@
     67CXX = @CXX@
     68CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    6769DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS)
    6870INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    … …  
    7072        -I$(PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES)
    7173INSTALL = @INSTALL@
    72 LDFLAGS = @LDFLAGS@
     74LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    7375LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
    7476    $(FASTCGI_LIBS) $(Z3950_LIBS)
    7577
    7678
    77 CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    78 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     79CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
     80CXXLINK = $(CXX) $(LDFLAGS) -o $@
    7981
    8082
    … …  
    8284.SUFFIXES: .cpp .o
    8385.cpp.o:
    84     $(CPPCOMPILE) $<
     86    $(CXXCOMPILE) $<
    8587
    8688
    … …  
    190192
    191193library: $(EXECUTABLE_OBJECTS)
    192     $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
     194    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    193195
    194196all: $(EXECUTABLE)
    … …  
    204206
    205207depend:
    206     makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
     208    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
Note: See TracChangeset for help on using the changeset viewer.