diff options
Diffstat (limited to 'security/zebedee/files/patch-Makefile')
-rw-r--r-- | security/zebedee/files/patch-Makefile | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/security/zebedee/files/patch-Makefile b/security/zebedee/files/patch-Makefile new file mode 100644 index 000000000000..047e600ad712 --- /dev/null +++ b/security/zebedee/files/patch-Makefile @@ -0,0 +1,87 @@ +--- Makefile.orig Tue Sep 6 07:59:53 2005 ++++ Makefile Thu Sep 15 07:34:55 2005 +@@ -5,7 +5,7 @@ + + ZBD_VERSION = 2.5.3 + +-OS = ++OS = freebsd + + ### + ### Locations of tools, libraries and installation directories. +@@ -14,13 +14,11 @@ + + # Choose your C compiler + +-CC_$(OS) = gcc +- + CC_win32 = gcc -mno-cygwin + CC_linux = gcc -pthread + CC_linux64 = $(CC_linux) -m64 + CC_solaris = gcc +-CC_freebsd = gcc -pthread ++CC_freebsd ?= gcc + CC_tru64 = cc + CC_irix = cc -n32 -woff 1110 + CC_hpux = cc -Ae +DAportable +@@ -31,7 +29,7 @@ + # Optimise/debug compilation + + #OPTIM = -Wall -g +-OPTIM = -Wall -O3 ++OPTIM = -Wall + + # Location of gmp include and library + # +@@ -46,25 +44,26 @@ + # BFINC = /usr/include/openssl + # BFLIB = -lcrypto + +-BFINC = -I../blowfish-0.9.5a +-BFLIB = ../blowfish-0.9.5a/libblowfish.a ++BFINC = -I$(OPENSSLINC) -I$(OPENSSLINC)/openssl ++BFLIB = $(OPENSSLLIB)/libcrypto.a + + # Location of zlib include and library + +-ZINC = -I../zlib-1.2.3 +-ZLIB = ../zlib-1.2.3/libz.a ++ZINC = ++ZLIB = -lz + + # Location of bzlib include and library + # Set these empty if you don't want bzib2 support + +-BZINC = -I../bzip2-1.0.3 +-BZLIB = ../bzip2-1.0.3/libbz2.a ++BZINC = -I$(LOCALBASE)/include ++BZLIB = -L$(LOCALBASE)/lib -lbz2 + + # + # Tools needed for Perl "POD"-format documentation conversion. + # + PERL_$(OS) = perl + PERL_win32 = c:/perl/bin/perl # Avoid Cygwin port ++PERL_freebsd = perl + PERL = $(PERL_$(OS)) + + BAT_win32 = .bat +@@ -186,7 +185,8 @@ + #### You REALLY shouldn't have to modify anything beyond here ... + #### + +-CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) ++CFLAGS ?= -03 ++CFLAGS += $(PTHREAD_CFLAGS) $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) + + LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) + +@@ -206,7 +206,7 @@ + @ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, linux64, solaris, freebsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi + + zebedee$(EXE) : $(OBJS) +- $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) ++ $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) $(PTHREAD_LIBS) + + huge.o : huge.h + |