diff options
| author | mm <mm@FreeBSD.org> | 2007-06-05 21:32:06 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2007-06-05 21:32:06 +0800 |
| commit | 872571f22f389e513f69f3bedf98c640d182ec13 (patch) | |
| tree | af5c4c6798a33b0488f89f479a766b7b366d8cc0 /lang | |
| parent | 1747c39e1e44e9b5c872fdc03a2a4e1c947f9c5f (diff) | |
| download | freebsd-ports-gnome-872571f22f389e513f69f3bedf98c640d182ec13.tar.gz freebsd-ports-gnome-872571f22f389e513f69f3bedf98c640d182ec13.tar.zst freebsd-ports-gnome-872571f22f389e513f69f3bedf98c640d182ec13.zip | |
- fix shared build on -CURRENT
- change tr to ${TR}
Suggested by: stas
Approved by: garga (mentor)
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tcl85/Makefile | 5 | ||||
| -rw-r--r-- | lang/tcl85/files/patch-unix-configure | 2 | ||||
| -rw-r--r-- | lang/tcl86/Makefile | 5 | ||||
| -rw-r--r-- | lang/tcl86/files/patch-unix-configure | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile index a53260084dfd..eeda70aab5b8 100644 --- a/lang/tcl85/Makefile +++ b/lang/tcl85/Makefile @@ -7,6 +7,7 @@ PORTNAME= tcl PORTVERSION= 8.5.a.6 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -706,9 +707,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ -e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltcl`echo $${TCL_VERSION} | tr -d .`/-ltcl`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ + -e 's/-ltcl`echo $${TCL_VERSION} | ${TR} -d .`/-ltcl`echo $${TCL_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \ -e 's|-ltclstub$${TCL_VERSION}|-ltclstub$${TCL_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ + -e 's/-ltclstub`echo $${TCL_VERSION} | ${TR} -d .`/-ltclstub`echo $${TCL_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \ -e 's|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \ diff --git a/lang/tcl85/files/patch-unix-configure b/lang/tcl85/files/patch-unix-configure index 6051da49a3d0..81d45a42a74e 100644 --- a/lang/tcl85/files/patch-unix-configure +++ b/lang/tcl85/files/patch-unix-configure @@ -14,7 +14,7 @@ # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -+ SHLIB_LD="ld -shared -x" ++ SHLIB_LD="${CC} -shared" + TCL_SHLIB_LD_EXTRAS="-soname \$@" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index a53260084dfd..eeda70aab5b8 100644 --- a/lang/tcl86/Makefile +++ b/lang/tcl86/Makefile @@ -7,6 +7,7 @@ PORTNAME= tcl PORTVERSION= 8.5.a.6 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -706,9 +707,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ -e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltcl`echo $${TCL_VERSION} | tr -d .`/-ltcl`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ + -e 's/-ltcl`echo $${TCL_VERSION} | ${TR} -d .`/-ltcl`echo $${TCL_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \ -e 's|-ltclstub$${TCL_VERSION}|-ltclstub$${TCL_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ + -e 's/-ltclstub`echo $${TCL_VERSION} | ${TR} -d .`/-ltclstub`echo $${TCL_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \ -e 's|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \ diff --git a/lang/tcl86/files/patch-unix-configure b/lang/tcl86/files/patch-unix-configure index 6051da49a3d0..81d45a42a74e 100644 --- a/lang/tcl86/files/patch-unix-configure +++ b/lang/tcl86/files/patch-unix-configure @@ -14,7 +14,7 @@ # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -+ SHLIB_LD="ld -shared -x" ++ SHLIB_LD="${CC} -shared" + TCL_SHLIB_LD_EXTRAS="-soname \$@" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" |