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

- remove useless --enable-static

Browse Source 
- 8.4 doesn't use CONFIGURE_SHARED either
- use arch -s instead of machine for static arch check
This commit is contained in:
brad 2004-07-04 03:18:59 +00:00
parent 6aa2e39493
commit 67c1a7414d
4 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lang/tcl/8.0/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2002/12/29 20:41:08 fgsch Exp $
# $OpenBSD: Makefile,v 1.13 2004/07/04 03:18:59 brad Exp $
# $FreeBSD: Makefile,v 1.4 1997/12/01 16:50:49 pst Exp $
COMMENT= "Tool Command Language"
@ -28,11 +28,6 @@ FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
.if (${MACHINE_ARCH} == "mips")
CONFIGURE_ARGS+= --disable-load
.endif
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}"
WRKDIST= ${WRKDIR}/${DISTNAME}/unix

3
lang/tcl/8.3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2002/12/04 21:06:31 naddy Exp $
# $OpenBSD: Makefile,v 1.19 2004/07/04 03:18:59 brad Exp $
# Uses pthreads (can but does not at the moment)
COMMENT= "Tool Command Language"
@ -30,7 +30,6 @@ FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}"
WRKDIST= ${WRKDIR}/tcl${VERSION}/unix

7
lang/tcl/8.4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2004/06/25 06:46:54 kevlo Exp $
# $OpenBSD: Makefile,v 1.9 2004/07/04 03:18:59 brad Exp $
# Uses pthreads (can but does not at the moment)
COMMENT= "Tool Command Language"
@ -28,11 +28,6 @@ FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf no-autoheader
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
CONFIGURE_ARGS+= --disable-shared
.endif
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}"
WRKDIST= ${WRKDIR}/tcl${VERSION}/unix

20
lang/tcl/8.4/patches/patch-tcl_m4
View File

@ -1,5 +1,5 @@
--- tcl.m4.orig Mon Mar 1 17:58:59 2004
+++ tcl.m4 Sat Jul 3 12:27:16 2004
--- tcl.m4.orig Mon Mar 1 18:58:59 2004
+++ tcl.m4 Sat Jul 3 22:51:24 2004
@@ -1209,7 +1209,7 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
@ -9,19 +9,17 @@
# Not available on all versions: check for include file.
AC_CHECK_HEADER(dlfcn.h, [
# NetBSD/SPARC needs -fPIC, -fpic will not do.
@@ -1245,6 +1245,55 @@ dnl AC_CHECK_TOOL(AR, ar)
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -1247,6 +1247,53 @@ dnl AC_CHECK_TOOL(AR, ar)
])
+
+ # FreeBSD doesn't handle version numbers with dots.
# 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
+ luna88k|mvme88k|vax)
+ case `arch -s` in
+ m88k|vax)
+ SHLIB_CFLAGS=""
+ SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
+ SHLIB_LD_LIBS='${LIBS}'
@ -63,5 +61,5 @@
+ ;;
+ esac
# FreeBSD doesn't handle version numbers with dots.
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
TCL_LIB_VERSIONS_OK=nodots