1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00

Fix for ELF build.

This commit is contained in:
Steve Price 1998-09-28 02:32:25 +00:00
parent e21990b7a7
commit d4c9c588e2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13504
2 changed files with 20 additions and 9 deletions

View File

@ -1,5 +1,5 @@
--- Makefile.custom.orig Wed May 24 07:12:05 1995
+++ Makefile.custom Fri Jan 3 00:46:15 1997
--- Makefile.custom.orig Wed May 24 09:12:05 1995
+++ Makefile.custom Sun Sep 27 12:04:31 1998
@@ -28,18 +28,18 @@
VERS = 1.2p03
@ -22,7 +22,7 @@
# Compress program
COMPRESS = gzip
@@ -73,8 +73,9 @@
@@ -73,8 +73,12 @@
#CCOPTIONS= -g
#LDOPTIONS= -lXaw -lXmu -lXt -lXext -lX11
# This is for cc on SunOS with debug
@ -31,10 +31,13 @@
+CCOPTIONS= -g -O2 -m486 -pipe -fno-strength-reduce \
+ -I/usr/include -I$(PREFIX)/include
+LDOPTIONS= -L/usr/lib -L$(PREFIX)/lib -lXaw -lXmu -lXt -lXext -lX11
+.if ${PORTOBJFORMAT} == "elf"
+LDOPTIONS+=-Wl,-rpath,$(X11BASE)/lib
+.endif
# Options for xshogi
# Use -DSENDTIME with at least gnushogix 1.2 patchlevel 3
@@ -88,8 +89,8 @@
@@ -88,8 +92,8 @@
# The option -DISS compiles xshogi for supporting the Internet Shogi Server.
OPT = -DHAS_GETTIMEOFDAY -DSENDTIME -DISS -DTOP_PART_BITMAPS # -DBOTH_BITMAPS -DWESTERN_BITMAPS

View File

@ -1,6 +1,6 @@
--- Makefile Wed May 7 16:28:12 1997
+++ /home/andy/tmp/wrk/Makefile Wed Mar 18 23:40:31 1998
@@ -6,6 +6,7 @@
--- Makefile.orig Wed May 7 11:28:12 1997
+++ Makefile Sun Sep 27 12:19:42 1998
@@ -6,21 +6,26 @@
HPFLAGS = -O -D_HPUX_SOURCE
SUNFLAGS = -O
LINUXFLAGS = -O
@ -8,7 +8,15 @@
INCDIR = -I/usr/include/X11R5 -I/usr/include -I/usr/X11R6/include
@@ -18,9 +19,10 @@
HPLINK = -L/usr/local/lib/X11R5 -lXt -lX11 -lm
SUNLINK = -L/usr/local/lib/X11R5 -lXt -lX11 -lm -lsocket -lnsl -lICE -lSM
LINUXLINK = -L/usr/X11R6/lib -lXt -lX11 -lm
+.if ${PORTOBJFORMAT} == "elf"
+LINUXLINK+= -Wl,-rpath,$(X11BASE)/lib
+.endif
all:
@echo "Makefile for XWorm v1.02 - written by The Last Viking (C) 1995-97 Ekran Design."
@echo " "
@echo "type:"
@echo " "
@ -22,7 +30,7 @@
@echo " "
@echo "xworm.font, xworm.grid and xworm.raw has to be in the same directory as xworm"
@echo "please check the Makefile if you have problems compiling the program"
@@ -33,6 +35,9 @@
@@ -33,6 +38,9 @@
linux: xworm.c
$(CC) $(LINUXFLAGS) $(INCDIR) xworm.c -o xworm $(LINUXLINK)