2e2307a013
to use "cc" rather than an absolute path (which is no longer correct). This fixes the build with that compiler without breaking the build using GCC.
67 lines
2.4 KiB
Text
67 lines
2.4 KiB
Text
$NetBSD: patch-ab,v 1.25 2010/01/25 23:04:49 tron Exp $
|
|
|
|
--- src/osdep/unix/Makefile.orig 2008-06-04 19:18:34.000000000 +0100
|
|
+++ src/osdep/unix/Makefile 2010-01-25 22:56:57.000000000 +0000
|
|
@@ -48,7 +48,7 @@
|
|
# Try to have some consistency in GCC builds. We want optimization, but we
|
|
# also want to be able to debug.
|
|
|
|
-GCCCFLAGS= -g $(GCCOPTLEVEL) -pipe -fno-omit-frame-pointer
|
|
+GCCCFLAGS= -pipe -fno-omit-frame-pointer
|
|
GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign
|
|
|
|
|
|
@@ -149,7 +149,7 @@
|
|
|
|
# Normally no need to change any of these
|
|
|
|
-ARCHIVE=c-client.a
|
|
+ARCHIVE=libc-client.la
|
|
BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \
|
|
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
|
|
rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
|
|
@@ -529,7 +529,7 @@
|
|
$(BUILD) `$(CAT) SPECIALS` OS=bsi \
|
|
CRXTYPE=nfs \
|
|
SPOOLDIR=/var \
|
|
- ACTIVEFILE=/var/db/news/active \
|
|
+ ACTIVEFILE=/var/news/db/active \
|
|
RSHPATH=/usr/bin/rsh \
|
|
BASECFLAGS="$(GCCCFLAGS)" \
|
|
BASELDFLAGS="-lcrypt"
|
|
@@ -718,7 +718,7 @@
|
|
RSHPATH=/usr/bin/rsh \
|
|
BASECFLAGS="-g -O -w" \
|
|
BASELDFLAGS="-lsocket -lnsl -lgen" \
|
|
- RANLIB=true CC=/opt/SUNWspro/bin/cc
|
|
+ RANLIB=true CC=cc
|
|
|
|
|
|
# Note: It is a long and disgusting story about why cc is set to ucbcc. You
|
|
@@ -855,7 +855,7 @@
|
|
@$(SH) ARCHIVE
|
|
|
|
.c.o:
|
|
- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
|
|
+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
|
|
|
|
|
|
# Cleanup
|
|
@@ -915,7 +915,7 @@
|
|
@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
|
|
@echo is not installed on your system. Either install OpenSSL first
|
|
@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
|
|
- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
|
|
+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
|
|
|
|
osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
|
|
$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
|
|
@@ -968,7 +968,7 @@
|
|
-DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
|
|
-DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
|
|
echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
|
|
- echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
|
|
+ echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`$(CAT) LDFLAGS\`" > ARCHIVE
|
|
echo $(OS) > OSTYPE
|
|
./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
|
|
./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
|