cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix usage of ranlib

Browse Source 
--
based on PR#: 1057 patches
This commit is contained in:
brad 2000-01-30 01:07:30 +00:00
parent 986722c4c5
commit 07d9e95877
2 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lang/tcl82/patches/patch-aa
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Tue Dec 14 22:59:18 1999
+++ Makefile.in Sun Jan 9 00:47:21 2000
+++ Makefile.in Sat Jan 29 18:47:39 2000
@@ -48,7 +48,9 @@
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
@ -38,30 +38,37 @@
libraries:
@@ -401,6 +403,11 @@
@MAKE_STUB_LIB@
$(RANLIB) ${STUB_LIB_FILE}
@@ -394,12 +396,15 @@
${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f ${TCL_LIB_FILE}
@MAKE_LIB@
- $(RANLIB) ${TCL_LIB_FILE}
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
@MAKE_STUB_LIB@
- $(RANLIB) ${STUB_LIB_FILE}
+
+libtcl82.a: ${OBJS}
+ rm -f libtcl82.a
+ ar cr libtcl82.a ${OBJS}
+ $(RANLIB) libtcl82.a
+
# 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
# extensions. used for the Tcl Plugin. -- dl
@@ -506,6 +513,10 @@
@@ -504,8 +509,10 @@
@echo "Installing $(TCL_LIB_FILE)"
chmod +x $(SRC_DIR)/install-sh
@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
- @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ @echo "Installing libtcl82.a"
+ @$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a)
+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE)"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
@@ -514,7 +525,8 @@
@@ -514,7 +521,8 @@
@echo "Installing tclsh"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@echo "Installing tclConfig.sh"
@ -71,7 +78,7 @@
@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
echo "Installing $(TCL_STUB_LIB_FILE)"; \
$(INSTALL_DATA) $(STUB_LIB_FILE) \
@@ -522,8 +534,8 @@
@@ -522,8 +530,8 @@
fi
install-libraries: libraries
@ -82,7 +89,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@@ -542,11 +554,19 @@
@@ -542,11 +550,19 @@
fi; \
done;
chmod +x $(SRC_DIR)/install-sh
@ -104,7 +111,7 @@
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
do \
echo "Installing $$i"; \
@@ -603,6 +623,14 @@
@@ -603,6 +619,14 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)

25
lang/tcl82/patches/patch-ab
View File

@ -1,5 +1,5 @@
--- configure.orig Wed Jan 5 21:33:45 2000
+++ configure Thu Jan 6 01:26:08 2000
--- configure.orig Tue Dec 14 22:59:18 1999
+++ configure Sat Jan 29 18:47:01 2000
@@ -4922,16 +4922,21 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
@ -26,3 +26,24 @@
else
echo "$ac_t""no" 1>&6
@@ -5592,10 +5597,9 @@
TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
+ MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}; \${RANLIB} \${TCL_LIB_FILE}"
else
MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
- RANLIB=":"
fi
else
case $system in
@@ -5674,7 +5678,7 @@
# Replace DBGX with TCL_DBGX
eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\""
-MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}"
+MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}; \${RANLIB} \${STUB_LIB_FILE}"
TCL_STUB_LIB_FILE=${STUB_LIB_FILE}