From 00f286c9be92e3e32bd669d7b0842e543f633369 Mon Sep 17 00:00:00 2001 From: jolan Date: Sat, 3 Jul 2004 21:04:45 +0000 Subject: [PATCH] hppa has shared libs now --- lang/tcl/8.4/patches/patch-Makefile_in | 18 +++++++------- lang/tcl/8.4/patches/patch-tcl_m4 | 33 +++++++++++++------------- x11/tk/8.4/patches/patch-Makefile_in | 12 +++++----- x11/tk/8.4/patches/patch-tcl_m4 | 33 +++++++++++++------------- 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/lang/tcl/8.4/patches/patch-Makefile_in b/lang/tcl/8.4/patches/patch-Makefile_in index 5c756655d18..dbbf172a2db 100644 --- a/lang/tcl/8.4/patches/patch-Makefile_in +++ b/lang/tcl/8.4/patches/patch-Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2004/05/20 21:25:46 miod Exp $ ---- Makefile.in.orig 2004-03-01 23:58:59.000000000 +0000 -+++ Makefile.in 2004-05-17 09:30:31.000000000 +0000 +$OpenBSD: patch-Makefile_in,v 1.3 2004/07/03 21:04:45 jolan Exp $ +--- Makefile.in.orig Mon Mar 1 17:58:59 2004 ++++ Makefile.in Sat Jul 3 12:25:26 2004 @@ -40,6 +40,9 @@ mandir = @mandir@ # when installing files. INSTALL_ROOT = @@ -89,15 +89,15 @@ $OpenBSD: patch-Makefile_in,v 1.2 2004/05/20 21:25:46 miod Exp $ - $(GENERIC_DIR)/tclPlatDecls.h ; \ + @echo "Installing libraries, tcl.h and other headers" + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ -+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ do \ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR); \ ++ echo "Installing $$i"; \ ++ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \ done; ++ @for i in $(UNIX_DIR)/*.h ; \ ++ do \ ++ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR); \ ++ done; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h diff --git a/lang/tcl/8.4/patches/patch-tcl_m4 b/lang/tcl/8.4/patches/patch-tcl_m4 index 06d1e5d15b6..b8a8fa5db27 100644 --- a/lang/tcl/8.4/patches/patch-tcl_m4 +++ b/lang/tcl/8.4/patches/patch-tcl_m4 @@ -1,5 +1,5 @@ ---- tcl.m4.orig 2004-03-01 23:58:59.000000000 +0000 -+++ tcl.m4 2004-05-17 12:45:28.000000000 +0000 +--- tcl.m4.orig Mon Mar 1 17:58:59 2004 ++++ tcl.m4 Sat Jul 3 12:27:16 2004 @@ -1209,7 +1209,7 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" @@ -9,14 +9,19 @@ # Not available on all versions: check for include file. AC_CHECK_HEADER(dlfcn.h, [ # NetBSD/SPARC needs -fPIC, -fpic will not do. -@@ -1251,6 +1251,56 @@ dnl AC_CHECK_TOOL(AR, ar) - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; +@@ -1245,6 +1245,55 @@ dnl AC_CHECK_TOOL(AR, ar) + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + ]) ++ ++ # FreeBSD doesn't handle version numbers with dots. ++ ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ TCL_LIB_VERSIONS_OK=nodots ++ ;; + OpenBSD-*) + case `machine` in -+ hppa|luna88k|mvme88k|vax) -+ # XXX not sure tclLdAout will work on hppa... ++ luna88k|mvme88k|vax) + SHLIB_CFLAGS="" + SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" + SHLIB_LD_LIBS='${LIBS}' @@ -57,12 +62,6 @@ + ) + ;; + esac -+ -+ # FreeBSD doesn't handle version numbers with dots. -+ -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ TCL_LIB_VERSIONS_OK=nodots -+ ;; - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" + + # FreeBSD doesn't handle version numbers with dots. + diff --git a/x11/tk/8.4/patches/patch-Makefile_in b/x11/tk/8.4/patches/patch-Makefile_in index a8fc03cad30..48c64a86240 100644 --- a/x11/tk/8.4/patches/patch-Makefile_in +++ b/x11/tk/8.4/patches/patch-Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2004/05/20 21:25:46 miod Exp $ ---- Makefile.in.orig 2004-03-02 00:04:48.000000000 +0000 -+++ Makefile.in 2004-05-17 10:34:16.000000000 +0000 +$OpenBSD: patch-Makefile_in,v 1.3 2004/07/03 21:05:52 jolan Exp $ +--- Makefile.in.orig Mon Mar 1 18:04:48 2004 ++++ Makefile.in Sat Jul 3 13:45:56 2004 @@ -227,7 +227,7 @@ TCL_STUB_FLAGS = @TCL_STUB_FLAGS@ # Libraries to use when linking. This definition is determined by the # configure script. @@ -62,13 +62,13 @@ $OpenBSD: patch-Makefile_in,v 1.2 2004/05/20 21:25:46 miod Exp $ - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ - $(GENERIC_DIR)/tkPlatDecls.h ; \ + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ + do \ +- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + echo "Installing $$i"; \ + $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \ + done + @for i in $(UNIX_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ ++ do \ + $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR); \ done; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h diff --git a/x11/tk/8.4/patches/patch-tcl_m4 b/x11/tk/8.4/patches/patch-tcl_m4 index 7c90faa6c5f..59a9353a476 100644 --- a/x11/tk/8.4/patches/patch-tcl_m4 +++ b/x11/tk/8.4/patches/patch-tcl_m4 @@ -1,5 +1,5 @@ ---- tcl.m4.orig 2004-03-02 00:04:48.000000000 +0000 -+++ tcl.m4 2004-05-17 12:40:54.000000000 +0000 +--- tcl.m4.orig Mon Mar 1 18:04:48 2004 ++++ tcl.m4 Sat Jul 3 14:09:56 2004 @@ -1209,7 +1209,7 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" @@ -9,14 +9,19 @@ # Not available on all versions: check for include file. AC_CHECK_HEADER(dlfcn.h, [ # NetBSD/SPARC needs -fPIC, -fpic will not do. -@@ -1251,6 +1251,56 @@ dnl AC_CHECK_TOOL(AR, ar) - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; +@@ -1245,6 +1245,55 @@ dnl AC_CHECK_TOOL(AR, ar) + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + ]) ++ ++ # FreeBSD doesn't handle version numbers with dots. ++ ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ TCL_LIB_VERSIONS_OK=nodots ++ ;; + OpenBSD-*) + case `machine` in -+ hppa|luna88k|mvme88k|vax) -+ # XXX not sure tclLdAout will work on hppa... ++ luna88k|mvme88k|vax) + SHLIB_CFLAGS="" + SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" + SHLIB_LD_LIBS='${LIBS}' @@ -57,12 +62,6 @@ + ) + ;; + esac -+ -+ # FreeBSD doesn't handle version numbers with dots. -+ -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ TCL_LIB_VERSIONS_OK=nodots -+ ;; - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" + + # FreeBSD doesn't handle version numbers with dots. +