diff options
| author | Roman Bogorodskiy <novel@FreeBSD.org> | 2013-03-16 09:35:14 +0000 |
|---|---|---|
| committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2013-03-16 09:35:14 +0000 |
| commit | 36e3a986177e1a453785aef87d85f516be89fba5 (patch) | |
| tree | 8e2cf2879a8641279534e1f5fc6299d8d3f5800d /sysutils/deltup | |
| parent | - MYSQL and PGSQL are default in b.o.d.m (diff) | |
- Fix build [1]
- Respect CC
Reported by: miwi [1]
Notes
Notes:
svn path=/head/; revision=314345
Diffstat (limited to 'sysutils/deltup')
| -rw-r--r-- | sysutils/deltup/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/deltup/files/patch-Makefile | 17 | ||||
| -rw-r--r-- | sysutils/deltup/files/patch-file.h | 29 |
3 files changed, 43 insertions, 5 deletions
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile index 263ecbe7e736..938c8a958dbe 100644 --- a/sysutils/deltup/Makefile +++ b/sysutils/deltup/Makefile @@ -52,8 +52,10 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/deltup.1 ${PREFIX}/man/man1 pre-build: @${REINPLACE_CMD} -e 's|-Wall -Winline -O2|-Wall -Winline -O2 ${CFLAGS}|' \ + -e 's|CC=gcc|CC?=gcc|' \ ${WRKSRC_BZIP2_102}/Makefile @${REINPLACE_CMD} -e 's|-Wall -Winline -O -g|-Wall -Winline -O2 ${CFLAGS}|' \ + -e 's|CC=gcc|CC?=gcc|' \ ${WRKSRC_BZIP2_103}/Makefile @cd ${WRKSRC_BZIP2_102}; ${GMAKE} bzip2; \ cd ${WRKSRC_BZIP2_103}; ${GMAKE} bzip2; diff --git a/sysutils/deltup/files/patch-Makefile b/sysutils/deltup/files/patch-Makefile index 3205fd7b3eb3..1f2ce73ec5c5 100644 --- a/sysutils/deltup/files/patch-Makefile +++ b/sysutils/deltup/files/patch-Makefile @@ -1,12 +1,13 @@ ---- Makefile.orig 2005-05-21 06:23:34.000000000 +0600 -+++ Makefile 2008-03-10 20:39:02.000000000 +0500 -@@ -1,16 +1,16 @@ +--- Makefile.orig 2005-05-21 04:23:34.000000000 +0400 ++++ Makefile 2013-03-16 09:57:42.000000000 +0400 +@@ -1,21 +1,21 @@ DESTDIR= -PREFIX=/usr +PREFIX=%%PREFIX%% BINDIR=$(PREFIX)/bin - CC = g++ +-CC = g++ ++CC ?= g++ -objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o +objfiles=bpatch.o bzip2.o gzip.o file.o system.o tmpstore.o deltup.o @@ -16,7 +17,13 @@ # gcc edelta.cpp ${CXXFLAGS} -o edelta %.o : %.cpp - ${CC} -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE -+ ${CC} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic #-DFIXED_FRAMERATE ++ ${CC} -c $< -o $@ ${CXXFLAGS} all: deltup + depend: +- gcc -MM *.cpp > .depend ++ ${CC} -MM *.cpp > .depend + + deltup: $(objfiles) + ${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs) diff --git a/sysutils/deltup/files/patch-file.h b/sysutils/deltup/files/patch-file.h new file mode 100644 index 000000000000..22609f45a0f1 --- /dev/null +++ b/sysutils/deltup/files/patch-file.h @@ -0,0 +1,29 @@ +--- file.h.orig 2013-03-16 09:40:32.000000000 +0400 ++++ file.h 2013-03-16 09:41:06.000000000 +0400 +@@ -12,6 +12,8 @@ + * Author: John Whitney <jjw@deltup.org> + */ + ++#include <zlib.h> ++ + class IStream { + public: + virtual unsigned read(void *data, unsigned num) = 0; +@@ -56,7 +58,7 @@ + }; + + class GZ_IFStream : public IStream { +- void *file; ++ gzFile_s *file; + public: + GZ_IFStream(string fname); + virtual ~GZ_IFStream(); +@@ -65,7 +67,7 @@ + }; + + class GZ_OFStream : public OStream { +- void *file; ++ gzFile_s *file; + public: + GZ_OFStream(string fname); + virtual ~GZ_OFStream(); |