This is the mail archive of the
insight@sources.redhat.com
mailing list for the Insight project.
Re: [RFA] Ignore toplevel RANLIB in tcl/tk
- From: Ian Roxborough <irox at redhat dot com>
- To: Keith Seitz <keiths at redhat dot com>
- Cc: insight at sources dot redhat dot com
- Date: Thu, 10 Jan 2002 11:43:50 -0800
- Subject: Re: [RFA] Ignore toplevel RANLIB in tcl/tk
- Organization: Red Hat Inc.
- References: <Pine.GSO.4.33.0201081840470.7664-100000@makita.cygnus.com>
Approved.
Thanks,
Ian
On Tue, 8 Jan 2002 19:32:42 -0800 (PST) Keith Seitz <keiths@redhat.com> wrote:
>
> Hi,
>
> This patch is required so that we can build with "--enable-shared" on
> linux. This is necessary because we need to be able to rebuild the
> tclIndex files, and tcl8.3 uses dynamic loading for all of this stuff.
>
> In order for shared libs to fully work, there is still an expect problem
> that needs to be overcome, but we'll worry about that later.
>
> This should allow us to start rebuilding the tclIndexes at long last...
> (I'll check in changes for gdb/gdbtk/library/Makefile soon.)
>
> Keith
>
> tcl/ChangeLog
> 2002-01-08 Keith Seitz <keiths@redhat.com>
>
> * unix/Makefile.in (TCL_RANLIB): Renamed from just "RANLIB".
> Changed all references to "RANLIB" to "TCL_RANLIB" so that
> toplevel Makefile doesn't override our own settings.
>
> Patch
> Index: unix/Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/tcl/unix/Makefile.in,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile.in
> --- unix/Makefile.in 2001/09/18 21:11:11 1.3
> +++ unix/Makefile.in 2002/01/09 03:30:33
> @@ -243,7 +243,7 @@ COMPAT_OBJS = @LIBOBJS@
>
> AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@
> AR = @AR@
> -RANLIB = @RANLIB@
> +TCL_RANLIB = @RANLIB@
> SRC_DIR = @srcdir@
> TOP_DIR = @srcdir@/..
> GENERIC_DIR = $(TOP_DIR)/generic
> @@ -438,12 +438,12 @@ doc:
> ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
> rm -f ${TCL_LIB_FILE}
> @MAKE_LIB@
> - $(RANLIB) ${TCL_LIB_FILE}
> + $(TCL_RANLIB) ${TCL_LIB_FILE}
>
> ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
> rm -f ${STUB_LIB_FILE}
> @MAKE_STUB_LIB@
> - $(RANLIB) ${STUB_LIB_FILE}
> + $(TCL_RANLIB) ${STUB_LIB_FILE}
>
> # Make target which outputs the list of the .o contained in the Tcl lib
> # usefull to build a single big shared library containing Tcl and other
> @@ -554,7 +554,7 @@ install-binaries: binaries
> fi
> @echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
> @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
> - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
> + @(cd $(LIB_INSTALL_DIR); $(TCL_RANLIB) $(TCL_LIB_FILE))
> @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
> @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
> echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
>
> tk/ChangeLog
> 2002-01-08 Keith Seitz <keiths@redhat.com>
>
> * unix/Makefile.in (TK_RANLIB): Renamed from just "RANLIB".
> Changed all references to "RANLIB" to "TK_RANLIB" so that
> toplevel Makefile doesn't override our own settings.
>
> Patch
> Index: unix/Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/tk/unix/Makefile.in,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile.in
> --- unix/Makefile.in 2001/09/19 00:44:46 1.4
> +++ unix/Makefile.in 2002/01/09 03:31:03
> @@ -248,7 +248,7 @@ TK_LD_SEARCH_FLAGS = @TK_LD_SEARCH_FLAGS
>
> AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@
> AR = @AR@
> -RANLIB = @RANLIB@
> +TK_RANLIB = @RANLIB@
> SRC_DIR = @srcdir@/..
> TOP_DIR = @srcdir@/..
> GENERIC_DIR = $(TOP_DIR)/generic
> @@ -399,12 +399,12 @@ doc: $(SRC_DIR)/doc/man.macros
> ${TK_LIB_FILE}: ${OBJS}
> rm -f ${TK_LIB_FILE}
> @MAKE_LIB@
> - $(RANLIB) ${TK_LIB_FILE}
> + $(TK_RANLIB) ${TK_LIB_FILE}
>
> ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
> rm -f ${STUB_LIB_FILE}
> @MAKE_STUB_LIB@
> - $(RANLIB) ${STUB_LIB_FILE}
> + $(TK_RANLIB) ${STUB_LIB_FILE}
>
> # Make target which outputs the list of the .o contained in the Tk lib
> # usefull to build a single big shared library containing Tcl/Tk and other
> @@ -486,7 +486,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
> fi
> @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
> @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
> - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
> + @(cd $(LIB_INSTALL_DIR); $(TK_RANLIB) $(TK_LIB_FILE))
> @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
> @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
> @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
>
>