lang/libtcl-nothread/patches/patch-aa

   1 $NetBSD$
   2
   3 --- Makefile.in.orig    2004-03-02 00:58:59.000000000 +0100
   4 +++ Makefile.in
   5 @@ -76,7 +76,7 @@ MANN_INSTALL_DIR      = $(MAN_INSTALL_DIR)/ma
   6  TCL_PACKAGE_PATH       = @TCL_PACKAGE_PATH@
   7
   8  # Libraries built with optimization switches have this additional extension
   9 -TCL_DBGX               = @TCL_DBGX@
  10 +TCL_DBGX               = ${NOTHREAD_SUFX}
  11
  12  # warning flags
  13  CFLAGS_WARNING         = @CFLAGS_WARNING@
  14 @@ -95,7 +95,7 @@ CFLAGS                        = @CFLAGS@ @CFLAGS_DEFAULT@ -DT
  15  # Flags to pass to the linker
  16  LDFLAGS_DEBUG          = @LDFLAGS_DEBUG@
  17  LDFLAGS_OPTIMIZE       = @LDFLAGS_OPTIMIZE@
  18 -LDFLAGS                        = @LDFLAGS@ @LDFLAGS_DEFAULT@
  19 +LDFLAGS                        = @LD_FLAGS@ @LDFLAGS@ @LDFLAGS_DEFAULT@
  20
  21  # To disable ANSI-C procedure prototypes reverse the comment characters
  22  # on the following lines:
  23 @@ -172,8 +172,8 @@ SHELL                       = /bin/sh
  24  INSTALL_STRIP_PROGRAM   = -s
  25  INSTALL_STRIP_LIBRARY  = -S -S
  26
  27 -INSTALL                        = @srcdir@/install-sh -c
  28 -INSTALL_PROGRAM                = ${INSTALL}
  29 +INSTALL                 := ${LIBTOOL} --mode=install @srcdir@/install-sh -c
  30 +INSTALL_PROGRAM         = ${INSTALL} -s
  31  INSTALL_LIBRARY                = ${INSTALL}
  32  INSTALL_DATA           = ${INSTALL} -m 644
  33
  34 @@ -191,7 +191,7 @@ TCL_EXE                     = tclsh
  35  # these definitions by hand.
  36
  37  STLIB_LD               = @STLIB_LD@
  38 -SHLIB_LD               = @SHLIB_LD@
  39 +SHLIB_LD               = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
  40  SHLIB_CFLAGS           = @SHLIB_CFLAGS@
  41  SHLIB_LD_FLAGS         = @SHLIB_LD_FLAGS@
  42  SHLIB_LD_LIBS          = @SHLIB_LD_LIBS@
  43 @@ -217,6 +217,7 @@ BUILD_DLTEST                = @BUILD_DLTEST@
  44  #BUILD_DLTEST          =
  45
  46  TCL_LIB_FILE           = @TCL_LIB_FILE@
  47 +TCL_LA_FILE            = ${TCL_LIB_FILE:C/@SHLIB_SUFFIX@/.la/}
  48  #TCL_LIB_FILE          = libtcl.a
  49
  50  # Generic lib name used in rules that apply to tcl and tk
  51 @@ -254,8 +255,9 @@ DLTEST_DIR          = @TCL_SRC_DIR@/unix/dltest
  52  # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
  53  TCL_BUILDTIME_LIBRARY  = @TCL_SRC_DIR@/library
  54
  55 -CC                     = @CC@
  56  #CC                    = purify -best-effort @CC@ -DPURIFY
  57 +CC                     = ${LIBTOOL} --mode=compile @CC@
  58 +LD                     = ${LIBTOOL} --mode=link @CC@
  59
  60  # Flags to be passed to mkLinks to control whether the manpages
  61  # should be compressed and linked with softlinks
  62 @@ -445,7 +447,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
  63
  64  all: binaries libraries doc
  65
  66 -binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
  67 +binaries: ${TCL_LA_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
  68
  69  libraries:
  70
  71 @@ -453,7 +455,7 @@ doc:
  72
  73  # The following target is configured by autoconf to generate either
  74  # a shared library or non-shared library for Tcl.
  75 -${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  76 +${TCL_LA_FILE}: ${OBJS} ${STUB_LIB_FILE}
  77         rm -f $@
  78         @MAKE_LIB@
  79
  80 @@ -473,8 +475,8 @@ tclLibObjs:
  81  objs: ${OBJS}
  82
  83
  84 -tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
  85 -       ${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
  86 +tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE}
  87 +       ${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
  88                 ${CC_SEARCH_FLAGS} -o tclsh
  89
  90  # Resetting the LIB_RUNTIME_DIR below is required so that
  91 @@ -482,11 +484,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
  92  # burned into its ld search path. This keeps tcltest from
  93  # picking up an already installed version of the Tcl library.
  94
  95 -tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
  96 +tcltest: ${TCLTEST_OBJS} ${TCL_LA_FILE} ${BUILD_DLTEST}
  97         $(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
  98
  99  tcltest-real:
 100 -       ${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 101 +       ${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 102                 ${CC_SEARCH_FLAGS} -o tcltest
 103
 104  # Note, in the target below TCL_LIBRARY needs to be set or else
 105 @@ -1054,7 +1056,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
 106
 107  xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
 108         @DL_OBJS@ ${BUILD_DLTEST}
 109 -       ${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
 110 +       ${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
 111                 @DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 112                 ${CC_SEARCH_FLAGS} -L/usr/openwin/lib -lXt -o xttest
 113