Changeset 20832 for gsdl/trunk/common-src/packages

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/common-src/packages

Files:

• Makefile.in (modified) (4 diffs)
• configure (modified) (2 diffs)

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

@@ -34 +34 @@
 endif
 
-# PACKAGEDIRS contains the packages that we want to make and install.  It
+# COMPILEDIRS contains the packages that we want to make and install.  It
 # is assumed that each package will have at least four rules: all, install,
 # clean, and distclean.
-PACKAGEDIRS =   expat gdbm $(SQLITE_DIR) search4j
+# CLEANDIRS is COMPILEDIRS and iconv and expat. Iconv and expat get compiled
+# up during the configure stage itself.
+COMPILEDIRS =   gdbm $(SQLITE_DIR) search4j
+CLEANDIRS = iconv expat $(COMPILEDIRS)
 
 
 all:
-    for odir in $(PACKAGEDIRS); do \
+    for odir in $(COMPILEDIRS); do \
           echo making $@ in $$odir; \
           (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
@@ -52 +55 @@
 
 install:
-    for idir in $(PACKAGEDIRS); do \
+    for idir in $(COMPILEDIRS); do \
           echo installing $$idir; \
           (cd $$idir && $(MAKE) install) || exit 1; \
@@ -58 +61 @@
 
 clean:
-    for subdir in $(PACKAGEDIRS); do \
+    for subdir in $(COMPILEDIRS); do \
           echo cleaning $@ in $$subdir; \
           (cd $$subdir && $(MAKE) clean || exit 0) ; \
@@ -64 +67 @@
 
 distclean:
-    for subdir in $(PACKAGEDIRS); do \
+    for subdir in $(CLEANDIRS); do \
           echo cleaning $@ in $$subdir; \
           (cd $$subdir && $(MAKE) distclean || exit 0) ; \

gsdl/trunk/common-src/packages/configure

@@ -119 +119 @@
 
 
-# configure expat (needs to be done before XML::Parser
+# configure expat (needs to be done before XML::Parser)
+# now compile expat during the configure stage itself
 echo ""
 echo "Configuring expat"
@@ -133 +134 @@
 cd "$PACKAGES/expat/expat-1.95.8" && \
 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
+
+echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $HOSTTARGETFLAGS $ENVIRONMENT
+CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $HOSTTARGETFLAGS $ENVIRONMENT
+
+echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
+CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
+
+
+# configure and compile libiconv during configuration stage
+echo ""
+echo "Configuring iconv"
+echo ""
+cd "$PACKAGES/iconv"
+if test ! -d libiconv-1.13.1 ;
+then
+  gzip -dc libiconv-1.13.1.tar.gz | tar -xf -
+fi
+
+# configure
+echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
+cd "$PACKAGES/iconv/libiconv-1.13.1" && \
+CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
+
+# make
+echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $HOSTTARGETFLAGS $ENVIRONMENT
+CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $HOSTTARGETFLAGS $ENVIRONMENT
+
+# make install
+echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
+CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
+
+#./configure $CACHE_FILE --prefix="$PACKAGES/iconv" --disable-shared $HOSTTARGETFLAGS&&
+#make && make install