Changeset 20832 for gsdl


Ignore:
Timestamp:
2009-10-21T16:47:07+13:00 (15 years ago)
Author:
ak19
Message:

Libiconv and libexpat are now compiled up during configure time rather than during Make. Committing files affected with adjustments related to this change, of which setup.bash adds the lib folder in common-src packages (generated by compiling libiconv) to the LD_LIBRARY_PATH for now. The last is probably not necessary since libiconv is generated as a static library (not shared).

Location:
gsdl/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/common-src/configure

    r18451 r20832  
    310310#endif"
    311311
    312 ac_subdirs_all="$ac_subdirs_all packages indexers"
     312ac_subdirs_all="$ac_subdirs_all packages"
     313ac_subdirs_all="$ac_subdirs_all indexers"
    313314ac_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 USE_SQLITE 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 gsdlos MODULEDIRS subdirs LTLIBOBJS'
    314315ac_subst_files=''
    … …  
    72497250
    72507251
    7251 subdirs="$subdirs packages indexers"
     7252subdirs="$subdirs packages"
     7253
     7254
     7255commonsrcprefix=`pwd`
     7256ac_configure_args="$ac_configure_args --with-libiconv-prefix=$commonsrcprefix/packages/iconv"
     7257
     7258
     7259subdirs="$subdirs indexers"
    72527260
    72537261
    … …  
    72587266         src/gdbmedit/gdbmget/Makefile \
    72597267         src/gdbmedit/gdbmset/Makefile \
    7260         src/gdbmedit/gdbmkeys/Makefile \
    7261         src/gdbmedit/gdbmdel/Makefile \
     7268    src/gdbmedit/gdbmkeys/Makefile \
     7269    src/gdbmedit/gdbmdel/Makefile \
    72627270         src/getpw/Makefile"
    72637271

  • gsdl/trunk/common-src/configure.in

    r18450 r20832  
    336336# ---------------------------------------------------------------------------
    337337
    338 AC_CONFIG_SUBDIRS(packages indexers)
     338AC_CONFIG_SUBDIRS(packages)
     339
     340commonsrcprefix=`pwd`
     341ac_configure_args="$ac_configure_args --with-libiconv-prefix=$commonsrcprefix/packages/iconv"
     342AC_CONFIG_SUBDIRS(indexers)
    339343
    340344# the list of folders in the src folder

  • gsdl/trunk/common-src/packages/Makefile.in

    r18028 r20832  
    3434endif
    3535
    36 # PACKAGEDIRS contains the packages that we want to make and install.  It
     36# COMPILEDIRS contains the packages that we want to make and install.  It
    3737# is assumed that each package will have at least four rules: all, install,
    3838# clean, and distclean.
    39 PACKAGEDIRS =   expat gdbm $(SQLITE_DIR) search4j
     39# CLEANDIRS is COMPILEDIRS and iconv and expat. Iconv and expat get compiled
     40# up during the configure stage itself.
     41COMPILEDIRS =   gdbm $(SQLITE_DIR) search4j
     42CLEANDIRS = iconv expat $(COMPILEDIRS)
    4043
    4144
    4245all:
    43     for odir in $(PACKAGEDIRS); do \
     46    for odir in $(COMPILEDIRS); do \
    4447          echo making $@ in $$odir; \
    4548          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
    … …  
    5255
    5356install:
    54     for idir in $(PACKAGEDIRS); do \
     57    for idir in $(COMPILEDIRS); do \
    5558          echo installing $$idir; \
    5659          (cd $$idir && $(MAKE) install) || exit 1; \
    … …  
    5861
    5962clean:
    60     for subdir in $(PACKAGEDIRS); do \
     63    for subdir in $(COMPILEDIRS); do \
    6164          echo cleaning $@ in $$subdir; \
    6265          (cd $$subdir && $(MAKE) clean || exit 0) ; \
    … …  
    6467
    6568distclean:
    66     for subdir in $(PACKAGEDIRS); do \
     69    for subdir in $(CLEANDIRS); do \
    6770          echo cleaning $@ in $$subdir; \
    6871          (cd $$subdir && $(MAKE) distclean || exit 0) ; \

  • gsdl/trunk/common-src/packages/configure

    r19778 r20832  
    119119
    120120
    121 # configure expat (needs to be done before XML::Parser
     121# configure expat (needs to be done before XML::Parser)
     122# now compile expat during the configure stage itself
    122123echo ""
    123124echo "Configuring expat"
    … …  
    133134cd "$PACKAGES/expat/expat-1.95.8" && \
    134135CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
     136
     137echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $HOSTTARGETFLAGS $ENVIRONMENT
     138CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $HOSTTARGETFLAGS $ENVIRONMENT
     139
     140echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
     141CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
     142
     143
     144# configure and compile libiconv during configuration stage
     145echo ""
     146echo "Configuring iconv"
     147echo ""
     148cd "$PACKAGES/iconv"
     149if test ! -d libiconv-1.13.1 ;
     150then
     151  gzip -dc libiconv-1.13.1.tar.gz | tar -xf -
     152fi
     153
     154# configure
     155echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
     156cd "$PACKAGES/iconv/libiconv-1.13.1" && \
     157CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
     158
     159# make
     160echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $HOSTTARGETFLAGS $ENVIRONMENT
     161CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $HOSTTARGETFLAGS $ENVIRONMENT
     162
     163# make install
     164echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
     165CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
     166
     167#./configure $CACHE_FILE --prefix="$PACKAGES/iconv" --disable-shared $HOSTTARGETFLAGS&&
     168#make && make install
    135169
    136170

  • gsdl/trunk/runtime-src/packages/configure

    r20746 r20832  
    190190  echo "add --disable-apache-httpd to the configure command to disable this"
    191191  echo ""
    192   echo "Setting up libiconv (used by Apache httpd)"
    193   cd "$PACKAGES/apache-httpd"
    194   if [ ! -e libiconv-1.13.1 ] ; then gzip -dc libiconv-1.13.1.tar.gz | tar -xf - ; fi
    195   cd libiconv-1.13.1&& \
    196     ./configure $CACHE_FILE --prefix="${prefix}/apache-httpd/${GSDLOS}" --disable-shared $HOSTTARGETFLAGS&&
    197     make && make install
    198   echo ""
     192#  echo "Setting up libiconv (used by Apache httpd)"
     193#  cd "$PACKAGES/apache-httpd"
     194#  if [ ! -e libiconv-1.13.1 ] ; then gzip -dc libiconv-1.13.1.tar.gz | tar -xf - ; fi
     195#  cd libiconv-1.13.1&& \
     196#    ./configure $CACHE_FILE --prefix="${prefix}/apache-httpd/${GSDLOS}" --disable-shared $HOSTTARGETFLAGS&&
     197#    make && make install
     198#  echo ""
    199199  echo "Configuring Apache httpd"
    200200  cd "$PACKAGES/apache-httpd"

  • gsdl/trunk/setup.bash

    r20342 r20832  
    248248
    249249  if test "$GSDLOS" = "linux" ; then
    250       LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
     250      LD_LIBRARY_PATH="$GSDLHOME/common-src/iconv/lib:$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
    251251      export LD_LIBRARY_PATH
    252252 
    253253  elif test "$GSDLOS" = "darwin" ; then
    254       DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
     254      DYLD_LIBRARY_PATH="$GSDLHOME/common-src/iconv/lib:$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
    255255      export DYLD_LIBRARY_PATH
    256256  fi
Note: See TracChangeset for help on using the changeset viewer.