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

fix usage of ranlib

Browse Source 
--
PR#: 1058
This commit is contained in:
brad 2000-01-14 04:33:22 +00:00
parent 38894ccadd
commit 1724791159
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x11/tk80/patches/patch-aa
View File

@ -1,5 +1,5 @@
--- configure.orig Tue Mar 9 01:53:50 1999
+++ configure Sun Jan 9 01:32:57 2000
+++ configure Thu Jan 13 20:27:11 2000
@@ -880,8 +880,8 @@
if test ! -d $TCL_BIN_DIR; then
{ echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
@ -20,7 +20,21 @@
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
# If Tcl and Tk are installed in different places, adjust the library
@@ -2600,6 +2602,7 @@
@@ -2389,12 +2391,11 @@
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
- RANLIB=":"
else
TK_SHARED_BUILD=0
TK_SHLIB_CFLAGS=""
TK_LIB_FILE=libtk${TCL_UNSHARED_LIB_SUFFIX}
- MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}"
+ MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}; \${RANLIB} \${TK_LIB_FILE}"
fi
DBGX='${TK_DBGX}'
@@ -2600,6 +2601,7 @@
s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
s%@TCL_DBGX@%$TCL_DBGX%g
s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g

32
x11/tk80/patches/patch-ab
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Tue Mar 9 01:53:50 1999
+++ Makefile.in Wed Jan 5 23:13:40 2000
+++ Makefile.in Thu Jan 13 21:11:54 2000
@@ -56,7 +56,9 @@
BIN_DIR = $(exec_prefix)/bin
@ -38,19 +38,28 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -311,6 +313,11 @@
@MAKE_LIB@
$(RANLIB) ${TK_LIB_FILE}
@@ -302,14 +304,18 @@
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
-all: wish
+all: ${TK_LIB_FILE} libtk80.a wish
# The following target is configured by autoconf to generate either
# a shared library or non-shared library for Tk.
${TK_LIB_FILE}: ${OBJS}
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
- $(RANLIB) ${TK_LIB_FILE}
+
+libtk80.a: ${OBJS}
+ rm -f libtk80.a
+ ar cr libtk80.a ${OBJS}
+ $(RANLIB) libtk80.a
+
# 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
# extensions. used for the Tcl Plugin. -- dl
@@ -365,7 +372,7 @@
@@ -365,7 +371,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@ -59,13 +68,14 @@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -379,13 +386,19 @@
@@ -377,15 +383,19 @@
done;
@echo "Installing $(TK_LIB_FILE)"
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
- @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
+ @echo "Installing libtk80.a"
+ @$(INSTALL_DATA) libtk80.a $(LIB_INSTALL_DIR)/libtk80.a
+ @(cd $(LIB_INSTALL_DIR); ranlib libtk80.a)
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk80.a
@echo "Installing wish"
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
@ -80,7 +90,7 @@
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -395,8 +408,18 @@
@@ -395,8 +405,18 @@
else true; \
fi; \
done;