ELFization patch.

PR:		ports/8044
Submitted by:	Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
This commit is contained in:
Jun Kuriyama 1998-09-27 08:24:37 +00:00
parent a1455aa4f6
commit 8f7ae93769
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13452
4 changed files with 61 additions and 347 deletions

View File

@ -3,7 +3,7 @@
# Date created:
# Whom: taguchi@tohoku.iij.ad.jp
#
# $Id: Makefile,v 1.4 1998/07/03 23:06:36 steve Exp $
# $Id: Makefile,v 1.5 1998/08/07 23:55:45 asami Exp $
#
DISTNAME= tk4.2p2
@ -16,10 +16,11 @@ PATCHFILES= tk4.2jp-patch.gz
MAINTAINER= taguchi@tohoku.iij.ad.jp
BUILD_DEPENDS= ${LOCALBASE}/lib/libtcl76jp.so\.1\.0:${PORTSDIR}/japanese/tcl76
LIB_DEPENDS= tcl76jp.1:${PORTSDIR}/japanese/tcl76
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
USE_XLIB= yes
CONFIGURE_ARGS= --enable-shared
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
@ -48,7 +49,7 @@ pre-install:
post-install:
cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} install
${LDCONFIG} -m ${PREFIX}/lib
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
@echo "**********"
@echo "IMPORTANT:"
@echo "**********"
@ -59,6 +60,9 @@ post-install:
@echo "conflicting with another version of Tcl/Tks."
test:
cd ${WRKSRC}; make test
cd ${WRKSRC}; ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test
install-man:
cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} install-man
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
--- ./unix/Makefile.in.ORIG Mon Feb 17 14:40:19 1997
+++ ./unix/Makefile.in Mon Feb 17 14:58:24 1997
--- ./unix/Makefile.in.ORIG Sun Sep 20 16:36:43 1998
+++ ./unix/Makefile.in Sun Sep 20 16:43:49 1998
@@ -56,7 +56,9 @@
BIN_DIR = $(exec_prefix)/bin
@ -34,7 +34,17 @@
# To turn off the security checks that disallow incoming sends when
# the X server appears to be insecure, reverse the comments on the
@@ -307,7 +309,7 @@
@@ -291,6 +293,9 @@
rm -f @TK_LIB_FILE@
@MAKE_LIB@
$(RANLIB) @TK_LIB_FILE@
+.if ${PORTOBJFORMAT}X == elfX
+ ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`
+.endif
wish: $(WISH_OBJS) $(TK_LIB_FILE)
$(CC) @LD_FLAGS@ $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \
@@ -307,12 +312,12 @@
test: tktest
LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
export LD_LIBRARY_PATH; \
@ -43,7 +53,19 @@
TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
( echo cd $(TOP_DIR)/tests\; source all\; exit ) \
| ./tktest -geometry +0+0
@@ -335,10 +337,12 @@
-install: install-binaries install-libraries install-demos install-man
+install: install-binaries install-libraries install-demos
# Note: before running ranlib below, must cd to target directory because
# some ranlibs write to current directory, and this might not always be
@@ -332,13 +337,18 @@
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
+.if ${PORTOBJFORMAT}X == elfX
+ @(cd $(LIB_INSTALL_DIR); ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`)
+.endif
@echo "Installing wish"
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
@echo "Installing tkConfig.sh"
@ -57,7 +79,7 @@
$(SCRIPT_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -348,8 +352,18 @@
@@ -348,8 +358,18 @@
else true; \
fi; \
done;
@ -78,7 +100,7 @@
for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/*.gif $(SRC_DIR)/library/*.xbm $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
do \
echo "Installing $$i"; \
@@ -401,28 +415,28 @@
@@ -401,28 +421,28 @@
@cd $(SRC_DIR)/doc; for i in *.1; \
do \
echo "Installing doc/$$i"; \

View File

@ -1,33 +1,5 @@
--- ./unix/configure.ORIG Tue Feb 11 18:36:42 1997
+++ ./unix/configure Tue Feb 11 18:40:37 1997
@@ -660,14 +660,14 @@
if test -n "$withval"; then
TCL_BIN_DIR=$withval
else
- TCL_BIN_DIR=`cd ../../tcl7.6/unix; pwd`
+ TCL_BIN_DIR=${prefix}/lib/tcl7.6jp
fi
if test ! -d $TCL_BIN_DIR; then
{ echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
fi
-if test ! -f $TCL_BIN_DIR/Makefile; then
- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl, or you did not use ports?" 1>&2; exit 1; }
fi
#--------------------------------------------------------------------
@@ -2115,6 +2115,7 @@
s%@SHLIB_VERSION@%$SHLIB_VERSION%g
s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
s%@TCL_VERSION@%$TCL_VERSION%g
s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
--- ./unix/configure.in.ORIG Tue Feb 11 18:36:43 1997
+++ ./unix/configure.in Tue Feb 11 18:40:56 1997
--- ./unix/configure.in.ORIG Sun Sep 20 16:37:42 1998
+++ ./unix/configure.in Sun Sep 20 16:51:27 1998
@@ -34,12 +34,12 @@
#--------------------------------------------------------------------
@ -44,7 +16,19 @@
fi
#--------------------------------------------------------------------
@@ -330,6 +330,7 @@
@@ -298,7 +298,11 @@
if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
eval "TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}"
+ if test "X$PORTOBJFORMAT" = "Xelf"; then
+ MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} -Wl,-soname,${TK_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
+ else
MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
+ fi
RANLIB=":"
else
TK_SHLIB_CFLAGS=""
@@ -330,6 +334,7 @@
AC_SUBST(SHLIB_VERSION)
AC_SUBST(TCL_BIN_DIR)
AC_SUBST(TCL_BUILD_LIB_SPEC)

View File

@ -18,8 +18,9 @@ include/tk4.2jp/unix/tkUnixInt.h
include/tk4.2jp/unix/tkUnixPort.h
lib/libtk42jp.a
lib/libtk42jp.so.1.0
@exec /sbin/ldconfig -m %B
@unexec /sbin/ldconfig -R
lib/libtk42jp.so
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/tk4.2jp/tkConfig.sh
lib/tk4.2jp/demos/images/earth.gif
lib/tk4.2jp/demos/images/earthris.gif
@ -107,306 +108,9 @@ lib/tk4.2jp/xmfbox.tcl
lib/tk4.2jp/tclIndex
lib/tk4.2jp/prolog.ps
lib/tk4.2jp/tkAppInit.c
man/man1/wish.1.gz
man/mann/bell.n.gz
man/mann/bind.n.gz
man/mann/bindtags.n.gz
man/mann/bitmap.n.gz
man/mann/button.n.gz
man/mann/canvas.n.gz
man/mann/checkbutton.n.gz
man/mann/clipboard.n.gz
man/mann/destroy.n.gz
man/mann/dialog.n.gz
man/mann/entry.n.gz
man/mann/focus.n.gz
man/mann/focusNext.n.gz
man/mann/frame.n.gz
man/mann/grab.n.gz
man/mann/grid.n.gz
man/mann/image.n.gz
man/mann/label.n.gz
man/mann/listbox.n.gz
man/mann/lower.n.gz
man/mann/menu.n.gz
man/mann/menubar.n.gz
man/mann/menubutton.n.gz
man/mann/message.n.gz
man/mann/option.n.gz
man/mann/optionMenu.n.gz
man/mann/options.n.gz
man/mann/pack-old.n.gz
man/mann/pack.n.gz
man/mann/palette.n.gz
man/mann/photo.n.gz
man/mann/place.n.gz
man/mann/popup.n.gz
man/mann/radiobutton.n.gz
man/mann/raise.n.gz
man/mann/scale.n.gz
man/mann/scrollbar.n.gz
man/mann/selection.n.gz
man/mann/send.n.gz
man/mann/text.n.gz
man/mann/tk.n.gz
man/mann/tkerror.n.gz
man/mann/tkvars.n.gz
man/mann/tkwait.n.gz
man/mann/toplevel.n.gz
man/mann/winfo.n.gz
man/mann/wm.n.gz
man/mann/tk_bindForTraversal.n.gz
man/mann/tk_bisque.n.gz
man/mann/tk_dialog.n.gz
man/mann/tk_focusFollowsMouse.n.gz
man/mann/tk_focusNext.n.gz
man/mann/tk_focusPrev.n.gz
man/mann/tk_menuBar.n.gz
man/mann/tk_optionMenu.n.gz
man/mann/tk_popup.n.gz
man/mann/tk_setPalette.n.gz
man/man3/3DBorder.3.gz
man/man3/BindTable.3.gz
man/man3/CanvPsY.3.gz
man/man3/CanvTkwin.3.gz
man/man3/CanvTxtInfo.3.gz
man/man3/Clipboard.3.gz
man/man3/ClrSelect.3.gz
man/man3/ConfigWidg.3.gz
man/man3/ConfigWind.3.gz
man/man3/CoordToWin.3.gz
man/man3/CrtErrHdlr.3.gz
man/man3/CrtGenHdlr.3.gz
man/man3/CrtImgType.3.gz
man/man3/CrtItemType.3.gz
man/man3/CrtPhImgFmt.3.gz
man/man3/CrtSelHdlr.3.gz
man/man3/DeleteImg.3.gz
man/man3/DrawFocHlt.3.gz
man/man3/EventHndlr.3.gz
man/man3/FindPhoto.3.gz
man/man3/FreeXId.3.gz
man/man3/GeomReq.3.gz
man/man3/GetAnchor.3.gz
man/man3/GetBitmap.3.gz
man/man3/GetCapStyl.3.gz
man/man3/GetClrmap.3.gz
man/man3/GetColor.3.gz
man/man3/GetCursor.3.gz
man/man3/GetFontStr.3.gz
man/man3/GetGC.3.gz
man/man3/GetImage.3.gz
man/man3/GetJoinStl.3.gz
man/man3/GetJustify.3.gz
man/man3/GetOption.3.gz
man/man3/GetPixels.3.gz
man/man3/GetPixmap.3.gz
man/man3/GetRelief.3.gz
man/man3/GetRootCrd.3.gz
man/man3/GetScroll.3.gz
man/man3/GetSelect.3.gz
man/man3/GetUid.3.gz
man/man3/GetVRoot.3.gz
man/man3/GetVisual.3.gz
man/man3/HandleEvent.3.gz
man/man3/IdToWindow.3.gz
man/man3/ImgChanged.3.gz
man/man3/InternAtom.3.gz
man/man3/MainLoop.3.gz
man/man3/MainWin.3.gz
man/man3/MaintGeom.3.gz
man/man3/ManageGeom.3.gz
man/man3/MapWindow.3.gz
man/man3/MoveToplev.3.gz
man/man3/Name.3.gz
man/man3/NameOfImg.3.gz
man/man3/OwnSelect.3.gz
man/man3/ParseArgv.3.gz
man/man3/QWinEvent.3.gz
man/man3/Restack.3.gz
man/man3/RestrictEv.3.gz
man/man3/SetAppName.3.gz
man/man3/SetClass.3.gz
man/man3/SetGrid.3.gz
man/man3/SetVisual.3.gz
man/man3/StrictMotif.3.gz
man/man3/Tk_Init.3.gz
man/man3/Tk_Main.3.gz
man/man3/WindowId.3.gz
man/man3/Tk_3DBorderColor.3.gz
man/man3/Tk_3DBorderGC.3.gz
man/man3/Tk_3DHorizontalBevel.3.gz
man/man3/Tk_3DVerticalBevel.3.gz
man/man3/Tk_Attributes.3.gz
man/man3/Tk_BindEvent.3.gz
man/man3/Tk_CanvasDrawableCoords.3.gz
man/man3/Tk_CanvasEventuallyRedraw.3.gz
man/man3/Tk_CanvasGetCoord.3.gz
man/man3/Tk_CanvasPsBitmap.3.gz
man/man3/Tk_CanvasPsColor.3.gz
man/man3/Tk_CanvasPsFont.3.gz
man/man3/Tk_CanvasPsPath.3.gz
man/man3/Tk_CanvasPsStipple.3.gz
man/man3/Tk_CanvasPsY.3.gz
man/man3/Tk_CanvasSetStippleOrigin.3.gz
man/man3/Tk_CanvasTagsOption.3.gz
man/man3/Tk_CanvasTextInfo.3.gz
man/man3/Tk_CanvasTkwin.3.gz
man/man3/Tk_CanvasWindowCoords.3.gz
man/man3/Tk_ChangeWindowAttributes.3.gz
man/man3/Tk_Changes.3.gz
man/man3/Tk_Class.3.gz
man/man3/Tk_ClearSelection.3.gz
man/man3/Tk_ClipboardAppend.3.gz
man/man3/Tk_Depth.3.gz
man/man3/Tk_ClipboardClear.3.gz
man/man3/Tk_Colormap.3.gz
man/man3/Tk_ConfigureInfo.3.gz
man/man3/Tk_ConfigureValue.3.gz
man/man3/Tk_ConfigureWidget.3.gz
man/man3/Tk_ConfigureWindow.3.gz
man/man3/Tk_CoordsToWindow.3.gz
man/man3/Tk_CreateBinding.3.gz
man/man3/Tk_CreateBindingTable.3.gz
man/man3/Tk_CreateErrorHandler.3.gz
man/man3/Tk_CreateEventHandler.3.gz
man/man3/Tk_CreateGenericHandler.3.gz
man/man3/Tk_CreateImageType.3.gz
man/man3/Tk_CreateItemType.3.gz
man/man3/Tk_CreatePhotoImageFormat.3.gz
man/man3/Tk_CreateSelHandler.3.gz
man/man3/Tk_Display.3.gz
man/man3/Tk_DefineBitmap.3.gz
man/man3/Tk_DefineCursor.3.gz
man/man3/Tk_DeleteAllBindings.3.gz
man/man3/Tk_DeleteBinding.3.gz
man/man3/Tk_DeleteBindingTable.3.gz
man/man3/Tk_DeleteErrorHandler.3.gz
man/man3/Tk_DeleteEventHandler.3.gz
man/man3/Tk_DeleteGenericHandler.3.gz
man/man3/Tk_DeleteImage.3.gz
man/man3/Tk_DeleteSelHandler.3.gz
man/man3/Tk_DisplayName.3.gz
man/man3/Tk_Draw3DPolygon.3.gz
man/man3/Tk_Draw3DRectangle.3.gz
man/man3/Tk_DrawFocusHighlight.3.gz
man/man3/Tk_Fill3DPolygon.3.gz
man/man3/Tk_Fill3DRectangle.3.gz
man/man3/Tk_FindPhoto.3.gz
man/man3/Tk_Free3DBorder.3.gz
man/man3/Tk_FreeBitmap.3.gz
man/man3/Tk_FreeColor.3.gz
man/man3/Tk_FreeColormap.3.gz
man/man3/Tk_FreeCursor.3.gz
man/man3/Tk_FreeFontStruct.3.gz
man/man3/Tk_FreeGC.3.gz
man/man3/Tk_FreeImage.3.gz
man/man3/Tk_FreeOptions.3.gz
man/man3/Tk_FreePixmap.3.gz
man/man3/Tk_FreeXId.3.gz
man/man3/Tk_GeometryRequest.3.gz
man/man3/Tk_Get3DBorder.3.gz
man/man3/Tk_GetAllBindings.3.gz
man/man3/Tk_GetAnchor.3.gz
man/man3/Tk_GetAtomName.3.gz
man/man3/Tk_GetBinding.3.gz
man/man3/Tk_GetBitmap.3.gz
man/man3/Tk_GetBitmapFromData.3.gz
man/man3/Tk_X.3.gz
man/man3/Tk_GetCapStyle.3.gz
man/man3/Tk_GetColor.3.gz
man/man3/Tk_GetColorByValue.3.gz
man/man3/Tk_GetColormap.3.gz
man/man3/Tk_GetCursor.3.gz
man/man3/Tk_GetCursorFromData.3.gz
man/man3/Tk_GetFontStruct.3.gz
man/man3/Tk_GetGC.3.gz
man/man3/Tk_GetImage.3.gz
man/man3/Tk_GetItemTypes.3.gz
man/man3/Tk_GetJoinStyle.3.gz
man/man3/Tk_GetJustify.3.gz
man/man3/Tk_GetOption.3.gz
man/man3/Tk_GetPixels.3.gz
man/man3/Tk_GetPixmap.3.gz
man/man3/Tk_GetRelief.3.gz
man/man3/Tk_GetRootCoords.3.gz
man/man3/Tk_GetScreenMM.3.gz
man/man3/Tk_GetScrollInfo.3.gz
man/man3/Tk_GetSelection.3.gz
man/man3/Tk_GetUid.3.gz
man/man3/Tk_GetVRootGeometry.3.gz
man/man3/Tk_GetVisual.3.gz
man/man3/Tk_HandleEvent.3.gz
man/man3/Tk_Height.3.gz
man/man3/Tk_IdToWindow.3.gz
man/man3/Tk_ImageChanged.3.gz
man/man3/Tk_InternAtom.3.gz
man/man3/Tk_InternalBorderWidth.3.gz
man/man3/Tk_IsMapped.3.gz
man/man3/Tk_IsTopLevel.3.gz
man/man3/Tk_MainLoop.3.gz
man/man3/Tk_MainWindow.3.gz
man/man3/Tk_MaintainGeometry.3.gz
man/man3/Tk_ManageGeometry.3.gz
man/man3/Tk_MapWindow.3.gz
man/man3/Tk_MoveResizeWindow.3.gz
man/man3/Tk_MoveToplevelWindow.3.gz
man/man3/Tk_MoveWindow.3.gz
man/man3/Tk_Name.3.gz
man/man3/Tk_NameOf3DBorder.3.gz
man/man3/Tk_NameOfAnchor.3.gz
man/man3/Tk_NameOfBitmap.3.gz
man/man3/Tk_NameOfCapStyle.3.gz
man/man3/Tk_NameOfColor.3.gz
man/man3/Tk_NameOfCursor.3.gz
man/man3/Tk_NameOfFontStruct.3.gz
man/man3/Tk_NameOfImage.3.gz
man/man3/Tk_NameOfJoinStyle.3.gz
man/man3/Tk_NameOfJustify.3.gz
man/man3/Tk_NameOfRelief.3.gz
man/man3/Tk_NameToWindow.3.gz
man/man3/Tk_Offset.3.gz
man/man3/Tk_OwnSelection.3.gz
man/man3/Tk_Parent.3.gz
man/man3/Tk_ParseArgv.3.gz
man/man3/Tk_PathName.3.gz
man/man3/Tk_PhotoBlank.3.gz
man/man3/Tk_PhotoExpand.3.gz
man/man3/Tk_PhotoGetImage.3.gz
man/man3/Tk_PhotoGetSize.3.gz
man/man3/Tk_PhotoPutBlock.3.gz
man/man3/Tk_PhotoPutZoomedBlock.3.gz
man/man3/Tk_PhotoSetSize.3.gz
man/man3/Tk_QueueWindowEvent.3.gz
man/man3/Tk_RedrawImage.3.gz
man/man3/Tk_ReqHeight.3.gz
man/man3/Tk_ReqWidth.3.gz
man/man3/Tk_ResizeWindow.3.gz
man/man3/Tk_RestackWindow.3.gz
man/man3/Tk_RestrictEvents.3.gz
man/man3/Tk_Screen.3.gz
man/man3/Tk_ScreenNumber.3.gz
man/man3/Tk_SetAppName.3.gz
man/man3/Tk_SetClass.3.gz
man/man3/Tk_SetBackgroundFromBorder.3.gz
man/man3/Tk_SetGrid.3.gz
man/man3/Tk_SetInternalBorder.3.gz
man/man3/Tk_SetWindowBackground.3.gz
man/man3/Tk_SetWindowBackgroundPixmap.3.gz
man/man3/Tk_SetWindowBorder.3.gz
man/man3/Tk_SetWindowBorderPixmap.3.gz
man/man3/Tk_SetWindowBorderWidth.3.gz
man/man3/Tk_SetWindowColormap.3.gz
man/man3/Tk_SetWindowVisual.3.gz
man/man3/Tk_SizeOfBitmap.3.gz
man/man3/Tk_SizeOfImage.3.gz
man/man3/Tk_StrictMotif.3.gz
man/man3/Tk_Uid.3.gz
man/man3/Tk_UndefineCursor.3.gz
man/man3/Tk_UnmaintainGeometry.3.gz
man/man3/Tk_UnmapWindow.3.gz
man/man3/Tk_UnsetGrid.3.gz
man/man3/Tk_Visual.3.gz
man/man3/Tk_Width.3.gz
man/man3/Tk_WindowId.3.gz
man/man3/Tk_Y.3.gz
@dirrm include/tk4.2jp/generic
@dirrm include/tk4.2jp/unix
@dirrm include/tk4.2jp
@dirrm lib/tk4.2jp/demos/images
@dirrm lib/tk4.2jp/demos
@dirrm lib/tk4.2jp