Check-in [8ef7a1eb1a]
Overview
Comment:Updated to statically link against libstdc++ on HP/UX

Added patch to metakit to not call "autoconf"

Fixed issue with sh on HP/UX (source versus ".")

Added support for statically linking to libgcc

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:8ef7a1eb1ab8011c7663af8df142f94f25519029
User & Date: rkeene on 2010-09-26 04:40:40
Other Links: manifest | tags
Context
2010-09-26
04:40
Cleaned up LDFLAGS settings

Fixed issue with "--with-zlib" wiping out LDFLAGS check-in: 56c3d5d022 user: rkeene tags: trunk

04:40
Updated to statically link against libstdc++ on HP/UX

Added patch to metakit to not call "autoconf"

Fixed issue with sh on HP/UX (source versus ".")

Added support for statically linking to libgcc check-in: 8ef7a1eb1a user: rkeene tags: trunk

04:40
KitCreator 0.0.8.x

Updated documentation regarding mipsel-linux cross-compiling check-in: 7b805333b0 user: rkeene tags: trunk, 0.0.8

Changes

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [e980cfaf2c] to [91d2c06e40].

    28     28   		fi
    29     29   	else
    30     30   		tclconfigshdir="${with_tcl}"
    31     31   		tclconfigsh="${tclconfigshdir}/tclConfig.sh"
    32     32   	fi
    33     33   
    34     34   	if test -f "${tclconfigsh}"; then
    35         -		source "${tclconfigsh}"
           35  +		. "${tclconfigsh}"
    36     36   
    37     37   		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
    38     38   		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
    39     39   		LDFLAGS="${LDFLAGS}"
    40     40   		LIBS="${LIBS} ${TCL_LIBS}"
    41     41   	fi
    42     42   
................................................................................
    78     78   		fi
    79     79   	else
    80     80   		tkconfigshdir="${with_tk}"
    81     81   		tkconfigsh="${tkconfigshdir}/tkConfig.sh"
    82     82   	fi
    83     83   
    84     84   	if test -f "${tkconfigsh}"; then
    85         -		source "${tkconfigsh}"
           85  +		. "${tkconfigsh}"
    86     86   
    87     87   		CFLAGS="${CFLAGS} ${TK_INCLUDE_SPEC} -I${TK_SRC_DIR}/generic -I${tkconfigshdir}"
    88     88   		CPPFLAGS="${CPPFLAGS} ${TK_INCLUDE_SPEC} -I${TK_SRC_DIR}/generic -I${tkconfigshdir}"
    89     89   		LDFLAGS="${LDFLAGS}"
    90     90   		LIBS="${LIBS} ${TK_LIBS}"
    91     91   	fi
    92     92   
................................................................................
    99     99   ])
   100    100   
   101    101   AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [
   102    102   	AC_MSG_CHECKING([for how to statically link to libstdc++])
   103    103   
   104    104   	SAVELIBS="${LIBS}"
   105    105   	staticlibcxx=""
   106         -	for trylink in "-Wl,-Bstatic -lCstd -lCrun -Wl,-Bdynamic" "-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic" "-lCstd -lCrun" "-lstdc++"; do
          106  +	dnl HP/UX uses -Wl,-a,archive -lstdc++ -Wl,-a,shared_archive
          107  +	dnl Linux and Solaris us -Wl,-Bstatic ... -Wl,-Bdynamic
          108  +	dnl
          109  +	dnl Sun Studio uses -lCstd -lCrun, most platforms use -lstdc++
          110  +	for trylink in "-Wl,-a,archive -lstdc++ -Wl,-a,shared_archive" "-Wl,-Bstatic -lCstd -lCrun -Wl,-Bdynamic" "-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic" "-lCstd -lCrun" "-lstdc++"; do
   107    111   		LIBS="${SAVELIBS} ${trylink}"
   108    112   
   109    113   		AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [
   110    114   			staticlibcxx="${trylink}"
   111    115   
   112    116   			break
   113    117   		])
................................................................................
   169    173   			AC_DEFINE(BUILD_tcl, [1], [Define if you need to pretend to be building Tcl (Windows)])
   170    174   			AC_DEFINE(BUILD_tk, [1], [Define if you need to pretend to be building Tk (Windows)])
   171    175   			;;
   172    176   		cygwin*)
   173    177   			CFLAGS="${CFLAGS} -mms-bitfields"
   174    178   			;;
   175    179   	esac
          180  +])
          181  +
          182  +AC_DEFUN(DC_STATIC_LIBGCC, [
          183  +	AC_MSG_CHECKING([how to link statically against libgcc])
          184  +
          185  +	SAVELDFLAGS="${LDFLAGS}"
          186  +	staticlibgcc=""
          187  +	for trylink in "-static-libgcc"; do
          188  +		LDFLAGS="${SAVELDFLAGS} ${trylink}"
          189  +		AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [
          190  +			staticlibgcc="${trylink}"
          191  +
          192  +			break
          193  +		])
          194  +	done
          195  +	if test -n "${staticlibgcc}"; then
          196  +		LDFLAGS="${SAVELDFLAGS} ${staticlibgcc}"
          197  +		AC_MSG_RESULT([${staticlibgcc}])
          198  +	else
          199  +		LDFLAGS="${SAVELDFLAGS}"
          200  +		AC_MSG_RESULT([not needed])
          201  +	fi
          202  +
   176    203   ])

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [1011f72d15] to [d4c560883c].

     7      7   AC_PROG_INSTALL
     8      8   AC_AIX
     9      9   AC_GNU_SOURCE
    10     10   
    11     11   dnl Find the appropriate libraries to link to
    12     12   AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
    13     13   AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])
           14  +
           15  +dnl Figure out how to statically link to libgcc, if needed
           16  +DC_STATIC_LIBGCC
    14     17   
    15     18   dnl Find the appropriate Tcl headers and libraries
    16     19   DC_DO_TCL
    17     20   
    18     21   dnl Find archives we need to link to
    19     22   DC_FIND_TCLKIT_LIBS
    20     23   

Added mk4tcl/patches/all/metakit-2.4.9.7-dontrequireautoconf.diff version [2f776fb8ca].

            1  +diff -uNr metakit-2.4.9.7-orig/unix/Makefile.in metakit-2.4.9.7-rsk/unix/Makefile.in
            2  +--- metakit-2.4.9.7-orig/unix/Makefile.in	2007-06-15 19:23:25.000000000 -0500
            3  ++++ metakit-2.4.9.7-rsk/unix/Makefile.in	2010-02-28 18:44:18.000000000 -0600
            4  +@@ -127,7 +127,7 @@
            5  + 	$(SHELL) ./config.status --recheck
            6  + 
            7  + $(srcdir)/configure: $(srcdir)/configure.in
            8  +-	cd $(srcdir) && autoconf
            9  ++	cd $(srcdir) && true
           10  + 
           11  + libmk4$(LIB_SUFFIX): $(LOBJS)
           12  + 	ar rcu $@ $(LOBJS)