124 lines
3.6 KiB
Plaintext
124 lines
3.6 KiB
Plaintext
Index: imap/src/osdep/unix/Makefile
|
|
--- imap/src/osdep/unix/Makefile.orig
|
|
+++ imap/src/osdep/unix/Makefile
|
|
@@ -44,7 +44,7 @@ BUNDLED=
|
|
# -O3 seems to be safe, but empirical observation from our local expert
|
|
# indicates that in some (many?) cases -O3 code runs slower than -O2.
|
|
|
|
-GCCOPTLEVEL= -O2
|
|
+GCCOPTLEVEL=
|
|
|
|
|
|
# Try to have some consistency in GCC builds. We want optimization, but we
|
|
@@ -56,9 +56,9 @@ GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign
|
|
|
|
# Extended flags needed for SSL. You may need to modify.
|
|
|
|
-SSLDIR=/usr/local/ssl
|
|
-SSLCERTS=$(SSLDIR)/certs
|
|
-SSLKEYS=$(SSLCERTS)
|
|
+SSLDIR=/usr
|
|
+SSLCERTS=/etc/ssl
|
|
+SSLKEYS=$(SSLCERTS)/private
|
|
SSLINCLUDE=$(SSLDIR)/include
|
|
SSLLIB=$(SSLDIR)/lib
|
|
|
|
@@ -149,6 +149,8 @@ DEFAULTAUTHENTICATORS=ext md5 pla log bea oa2
|
|
DEFAULTDRIVERS=imap nntp pop3 mix mx mbx tenex mtx mh mmdf unix news phile
|
|
CHUNKSIZE=65536
|
|
|
|
+.SUFFIXES: .o .so
|
|
+
|
|
# Normally no need to change any of these
|
|
|
|
ARCHIVE=c-client.a
|
|
@@ -156,6 +158,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf
|
|
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
|
|
rfc822.o nntp.o smtp.o imap4r1.o http.o json.o pop3.o \
|
|
unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o sha.o
|
|
+SOBINARIES=$(BINARIES:.o=.so)
|
|
CFLAGS=-g
|
|
|
|
CAT=cat
|
|
@@ -164,6 +167,11 @@ MV=mv
|
|
RM=rm -rf
|
|
SH=sh
|
|
|
|
+.if ${MACHINE_ARCH} == "sparc64"
|
|
+PICFLAG= -fPIC
|
|
+.else
|
|
+PICFLAG= -fpic
|
|
+.endif
|
|
|
|
# Primary build command
|
|
|
|
@@ -283,6 +291,7 @@ bso: # OpenBSD
|
|
SPOOLDIR=/var \
|
|
ACTIVEFILE=/usr/local/news/lib/active \
|
|
RSHPATH=/usr/bin/rsh \
|
|
+ LOCKPGM=$(PREFIX)/libexec/mlock \
|
|
BASECFLAGS="$(GCCCFLAGS)"
|
|
|
|
cvx: # Convex
|
|
@@ -872,23 +881,29 @@ vu2: # VAX Ultrix 2.3, etc.
|
|
|
|
# Build it!
|
|
|
|
-build: clean once $(ARCHIVE)
|
|
+build: clean once $(ARCHIVE) $(SHLIB)
|
|
|
|
-all: $(ARCHIVE)
|
|
+all: $(ARCHIVE) $(SHLIB)
|
|
|
|
$(ARCHIVE): $(BINARIES)
|
|
sh -c '$(RM) $(ARCHIVE) || true'
|
|
@$(CAT) ./ARCHIVE
|
|
@$(SH) ./ARCHIVE
|
|
|
|
+$(SHLIB): $(SOBINARIES)
|
|
+ $(CC) -shared $(PICFLAG) $(SSLLDFLAGS) -o $(SHLIB) $(SOBINARIES)
|
|
+
|
|
.c.o:
|
|
`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
|
|
|
|
+.c.so:
|
|
+ `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $(PICFLAG) -DPIC $(@:.so=.c) -o $@
|
|
|
|
+
|
|
# Cleanup
|
|
|
|
clean:
|
|
- sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
|
|
+ sh -c '$(RM) auths.c crexcl.c linkage.[ch] siglocal.c osdep*.[ch] *.o *.so ARCHIVE *FLAGS *TYPE $(ARCHIVE) $(SHLIB) || true'
|
|
|
|
|
|
# Dependencies
|
|
@@ -925,7 +940,7 @@ sha.o: mail.h misc.h osdep.h sha.h sha-private.h hash.
|
|
|
|
# OS-dependent
|
|
|
|
-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
|
|
+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
|
|
osdep.h env_unix.h tcp_unix.h oauth2_aux.h \
|
|
osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
|
|
auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
|
|
@@ -940,12 +955,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
|
|
write.c sslstdio.c \
|
|
strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
|
|
OSCFLAGS
|
|
- @echo Building OS-dependent module
|
|
- @echo If you get No such file error messages for files x509.h, ssl.h,
|
|
- @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
|
|
+
|
|
+osdep.o: $(OSDEPS)
|
|
+ `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c
|
|
+
|
|
+osdep.so: $(OSDEPS)
|
|
+ `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` $(PICFLAG) -DPIC osdep.c -o $@
|
|
|
|
osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
|
|
$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
|