- fix shared build on -CURRENT
- change tr to ${TR}
Suggested by: stas
Approved by: garga (mentor)
This commit is contained in:
Martin Matuska
parent
a5861b89df
commit
506f2b305a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=192840
@ -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' \
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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' \
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= tk
|
||||
PORTVERSION= 8.5.a.6
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= x11-toolkits
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= tcl
|
||||
@ -406,9 +406,9 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
|
||||
-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
|
||||
-e 's|-ltk$${TK_VERSION}|-ltk$${TK_VERSION}${THREADS_SUFFIX}|g' \
|
||||
-e 's/-ltk`echo $${TK_VERSION} | tr -d .`/-ltk`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
|
||||
-e 's/-ltk`echo $${TK_VERSION} | ${TR} -d .`/-ltk`echo $${TK_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \
|
||||
-e 's|-ltkstub$${TK_VERSION}|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}|g' \
|
||||
-e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
|
||||
-e 's/-ltkstub`echo $${TK_VERSION} | ${TR} -d .`/-ltkstub`echo $${TK_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \
|
||||
-e 's|$$(BIN_INSTALL_DIR)/wish$$(VERSION)|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}|g' \
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
- SHLIB_LD="ld -Bshareable -x"
|
||||
+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
|
||||
+ SHLIB_LD="ld -shared -x"
|
||||
+ SHLIB_LD="${CC} -shared"
|
||||
SHLIB_LD_LIBS='${LIBS}'
|
||||
SHLIB_SUFFIX=".so"
|
||||
DL_OBJS="tclLoadDl.o"
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= tk
|
||||
PORTVERSION= 8.5.a.6
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= x11-toolkits
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= tcl
|
||||
@ -406,9 +406,9 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
|
||||
-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
|
||||
-e 's|-ltk$${TK_VERSION}|-ltk$${TK_VERSION}${THREADS_SUFFIX}|g' \
|
||||
-e 's/-ltk`echo $${TK_VERSION} | tr -d .`/-ltk`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
|
||||
-e 's/-ltk`echo $${TK_VERSION} | ${TR} -d .`/-ltk`echo $${TK_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \
|
||||
-e 's|-ltkstub$${TK_VERSION}|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}|g' \
|
||||
-e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
|
||||
-e 's/-ltkstub`echo $${TK_VERSION} | ${TR} -d .`/-ltkstub`echo $${TK_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \
|
||||
-e 's|$$(BIN_INSTALL_DIR)/wish$$(VERSION)|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}|g' \
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
- SHLIB_LD="ld -Bshareable -x"
|
||||
+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
|
||||
+ SHLIB_LD="ld -shared -x"
|
||||
+ SHLIB_LD="${CC} -shared"
|
||||
SHLIB_LD_LIBS='${LIBS}'
|
||||
SHLIB_SUFFIX=".so"
|
||||
DL_OBJS="tclLoadDl.o"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user