mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Make sure the shared library is explicitly linked with -lm. On

Browse Source 
some occasions, this prevent it from being loaded properly, even
though other libs  already loaded already bring in  -lm. I don't
understand the rtld :(

Only  build the  Tk related  help files,  if WITHOUT_X11  is not
specified. Previously they were built, but not installed. If you
did not have  Tk installed, that build failed for  you -- see PR
29722...

PR:		ports/29722
This commit is contained in:
Mikhail Teterin 2001-08-19 15:03:59 +00:00
parent 405b18363b
commit 079e1e2389
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=46480
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lang/tclX/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= tclX
PORTVERSION= 8.2.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang tcl${TCL_DVER} tk${TCL_DVER}
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
DISTNAME= tclX8.2.0
@ -27,7 +27,6 @@ TCL_DVER?= ${TCL_VER:S/.//}
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
ALL_TARGET= all buildhelp
CONFIGURE_ARGS= --enable-shared \
--with-tcl="${LOCALBASE}/lib/tcl${TCL_VER}" \
--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
@ -41,6 +40,8 @@ CONFIGURE_ARGS+=--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
PLIST_SUB+= X11=''
.endif
MAKE_ENV= LDFLAGS="-lm"
MAN3= CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
TclCommandWriting.3 \
TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \
@ -52,6 +53,13 @@ MAN3= CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
MANN= Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
post-build:
cd ${WRKSRC}/../tcl/unix && ${MAKE} buildhelp
.ifndef WITHOUT_X11
cd ${WRKSRC}/../tk/unix && ${MAKE} buildhelp
.endif
.include <bsd.port.pre.mk>
post-install:

2
lang/tclX/files/patch-ab
View File

@ -14,7 +14,7 @@
TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
- ${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
+ ${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@
+ ${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@ -lm
+ ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
hello: hello.c

12
lang/tclX82/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= tclX
PORTVERSION= 8.2.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang tcl${TCL_DVER} tk${TCL_DVER}
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
DISTNAME= tclX8.2.0
@ -27,7 +27,6 @@ TCL_DVER?= ${TCL_VER:S/.//}
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
ALL_TARGET= all buildhelp
CONFIGURE_ARGS= --enable-shared \
--with-tcl="${LOCALBASE}/lib/tcl${TCL_VER}" \
--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
@ -41,6 +40,8 @@ CONFIGURE_ARGS+=--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
PLIST_SUB+= X11=''
.endif
MAKE_ENV= LDFLAGS="-lm"
MAN3= CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
TclCommandWriting.3 \
TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \
@ -52,6 +53,13 @@ MAN3= CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
MANN= Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
post-build:
cd ${WRKSRC}/../tcl/unix && ${MAKE} buildhelp
.ifndef WITHOUT_X11
cd ${WRKSRC}/../tk/unix && ${MAKE} buildhelp
.endif
.include <bsd.port.pre.mk>
post-install:

2
lang/tclX82/files/patch-ab
View File

@ -14,7 +14,7 @@
TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
- ${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
+ ${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@
+ ${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@ -lm
+ ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
hello: hello.c